Download as
Browse Code »

Commit 377f4cbaf7e58ed80b5d60bb95f99e7272290390

Authored by Erik Zambom
Committed by GitHub
2 parents f9508fd1 0f20aeb7
Exists in master and in 2 other branches amadeus_univasf, refactoring

Merge pull request #569 from amadeusproject/refactoring 

Daily Update - 22_09_2017
Showing 4 changed files with 85 additions and 67 deletions   Show diff stats
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @377f4cb
... ... @@ -276,12 +276,20 @@
276 276 p{
277 277 margin: 10px;
278 278 }
  279 + .slide_toggle{
  280 + visibility: hidden;
  281 + }
  282 + .carousel-caption{
  283 + position: static;
  284 + text-align: center;
  285 + font-size: 1em;
  286 + }
279 287 }
280 288 @media(max-width:610px){
281 289 .outside-title{
282 290 font-size:1.5em;
283 291 }
284   -
  292 +
285 293 .container-fluid {
286 294 padding-left: 10px;
287 295 padding-right: 10px;
... ... @@ -290,4 +298,15 @@
290 298 p{
291 299 margin: 10px;
292 300 }
  301 + .carousel-caption{
  302 + position: static;
  303 + text-align: center;
  304 + font-size: 1em;
  305 + }
293 306 }
  307 +
  308 +@media(min-width: 500px) {
  309 + .dropdown-menu{
  310 + margin-left: 100px;
  311 + }
  312 +}
294 313 \ No newline at end of file
... ...
subjects/templates/subjects/home.html
  Diff comments   View file @377f4cb
... ... @@ -24,10 +24,10 @@
24 24 <div id="myCarousel" class="carousel slide " data-ride="carousel">
25 25 <!-- Indicators -->
26 26 <ol class="carousel-indicators">
27   - <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
  27 + <li class="slide_toggle" data-target="#myCarousel" data-slide-to="0" class="active"></li>
28 28 {% for new in news %}
29 29 {% if forloop.counter != news.count %}
30   - <li data-target="#myCarousel" data-slide-to="{{forloop.counter}}"></li>
  30 + <li class="slide_toggle" data-target="#myCarousel" data-slide-to="{{forloop.counter}}"></li>
31 31 {% endif %}
32 32 {% endfor %}
33 33 </ol>
... ...
users/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @377f4cb
... ... @@ -259,8 +259,6 @@ msgid &quot;No users found&quot;
259 259 msgstr "Nenhum usuário encontrado"
260 260  
261 261 #: users/templates/users/login.html:43
262   -#, fuzzy
263   -#| msgid "Sign in with your account to continue"
264 262 msgid "Sign in with your account"
265 263 msgstr "Entre com a sua conta"
266 264  
... ...
users/templates/users/register.html
  Diff comments   View file @377f4cb
... ... @@ -48,73 +48,74 @@
48 48 <form class="{% if form.has_error %} has-error {% endif %} form-horizontal is-fileinput" method="post" enctype="multipart/form-data" id="user-form">
49 49 {% csrf_token %}
50 50 {% for field in form %}
51   - <div class="col-lg-12 col-md-12 col-sm-12">
52   - <div class="form-group form-group-md">
53   - <div class="col-md-12 col-sm-12 col-xs-12 col-lg-12">
54   - {% if field.auto_id == 'id_image' %}
55   - <label for="{{ field.auto_id }}">{{ field.label }}</label>
56   -
  51 + {% if field.auto_id == 'id_show_email' %}
  52 + {% elif field.auto_id == 'id_x' %}
  53 + <input class="form-control" id="id_x" name="x" type="hidden">
  54 + {% elif field.auto_id == 'id_y' %}
  55 + <input class="form-control" id="id_y" name="y" type="hidden">
  56 + {% elif field.auto_id == 'id_width' %}
  57 + <input class="form-control" id="id_width" name="width" type="hidden">
  58 + {% elif field.auto_id == 'id_height' %}
  59 + <input class="form-control" id="id_height" name="height" type="hidden">
  60 + {% else %}
  61 + <div class="col-lg-12 col-md-12 col-sm-12">
  62 + <div class="form-group form-group-md">
  63 + <div class="col-md-12 col-sm-12 col-xs-12 col-lg-12">
  64 + {% if field.auto_id == 'id_image' %}
  65 + <label for="{{ field.auto_id }}">{{ field.label }}</label>
57 66 {% render_field field class='form-control file-selector' %}
58   -
59   - <div class="input-group common-file-input">
60   - <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
61   - <span class="input-group-btn input-group-sm">
62   - <button type="button" class="btn btn-fab btn-fab-mini">
63   - <i class="material-icons">attach_file</i>
64   - </button>
65   - </span>
66   - </div>
67   -
68   - <div class="filedrag">
69   - {% if acc.image %}
70   - <i class="fa fa-file-archive-o"></i> <br />
71   -
72   - <small>{{ acc.image.path }}</small>
73   - {% else %}
74   - {% trans 'Click or drop the file here' %}<br />
75   -
76   - <small>{% trans 'The photo could not exceed 2MB.' %}</small>
77   - {% endif %}
78   - </div>
79   - {% else %}
80   - {% if field.auto_id == 'id_show_email' %}
81   - {% else %}
82   - {% render_field field class='form-control' %}
83   - {% endif %}
84   -
85   -
  67 + <div class="input-group common-file-input">
  68 + <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
  69 + <span class="input-group-btn input-group-sm">
  70 + <button type="button" class="btn btn-fab btn-fab-mini">
  71 + <i class="material-icons">attach_file</i>
  72 + </button>
  73 + </span>
  74 + </div>
  75 + <div class="filedrag">
  76 + {% if acc.image %}
  77 + <i class="fa fa-file-archive-o"></i> <br />
  78 + <small>{{ acc.image.path }}</small>
  79 + {% else %}
  80 + {% trans 'Click or drop the file here' %}<br />
  81 + <small>{% trans 'The photo could not exceed 2MB.' %}</small>
  82 + {% endif %}
  83 + </div>
  84 + {% else %}
  85 + {% render_field field class='form-control' %}
  86 + {% endif %}
  87 +
  88 + <span class="help-block">{{ field.help_text }}</span>
  89 + </div>
  90 + {% if field.errors %}
  91 + <div class="row">
  92 + <div class="alert alert-danger alert-dismissible" role="alert">
  93 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  94 + <span aria-hidden="true">&times;</span>
  95 + </button>
  96 + <ul>
  97 + {% for error in field.errors %}
  98 + <li>{{ error }}</li>
  99 + {% endfor %}
  100 + </ul>
  101 + </div>
  102 + </div>
86 103 {% endif %}
87   - <span class="help-block">{{ field.help_text }}</span>
88   - </div>
89   -
90   - {% if field.errors %}
91   - <div class="row">
92   - <div class="alert alert-danger alert-dismissible" role="alert">
93   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
94   - <span aria-hidden="true">&times;</span>
95   - </button>
  104 +
  105 + {% if field.auto_id == 'id_image' %}
  106 + <div class="col-lg-12 col-md-12 col-sm-12 alert alert-danger alert-dismissible client-file-errors" style="display:none" role="alert">
  107 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  108 + <span aria-hidden="true">&times;</span>
  109 + </button>
96 110 <ul>
97   - {% for error in field.errors %}
98   - <li>{{ error }}</li>
99   - {% endfor %}
  111 + <li class="size" style="display:none">{% trans "The image is too large. It should have less than 2MB." %}</li>
  112 + <li class="format" style="display:none">{% trans 'File not supported.' %}</li>
100 113 </ul>
101 114 </div>
102   - </div>
103   - {% endif %}
104   -
105   - {% if field.auto_id == 'id_image' %}
106   - <div class="col-lg-12 col-md-12 col-sm-12 alert alert-danger alert-dismissible client-file-errors" style="display:none" role="alert">
107   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
108   - <span aria-hidden="true">&times;</span>
109   - </button>
110   - <ul>
111   - <li class="size" style="display:none">{% trans "The image is too large. It should have less than 2MB." %}</li>
112   - <li class="format" style="display:none">{% trans 'File not supported.' %}</li>
113   - </ul>
114   - </div>
115   - {% endif %}
  115 + {% endif %}
  116 + </div>
116 117 </div>
117   - </div>
  118 + {% endif %}
118 119 {% endfor %}
119 120 <div class="row">
120 121 <div class="col-lg-12 col-md-12 col-sm-12">
... ... @@ -146,7 +147,7 @@ function Init() {
146 147 var small = $(".file-selector"),
147 148 filedrag = $(".filedrag"),
148 149 common = $(".common-file-input");
149   -
  150 +
150 151 // file select
151 152 small.on("change", FileSelectHandler);
152 153  
... ...