Download as
Browse Code »

Commit 2eb6fbf432b554eb18d2e7ba24ea0cad9c2168ae

Authored by ailsoncgt
1 parent a5eaae27
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Adjustes in template #211

Showing 1 changed file with 42 additions and 8 deletions   Show diff stats
app/templates/admin_settings.html
  Diff comments   View file @2eb6fbf
... ... @@ -19,13 +19,13 @@
19 19 <!-- Nav tabs -->
20 20 <ul class="nav nav-tabs md-pills pills-ins" role="tablist">
21 21 <li class="nav-item">
22   - <a class="nav-link active" data-toggle="tab" href="#panel1" role="tab"><i class="fa fa-cog"></i> System</a>
  22 + <a class="nav-link active" data-toggle="tab" href="#panel1" role="tab"><i class="fa fa-cog"></i> {% trans "System" %}</a>
23 23 </li>
24 24 <li class="nav-item">
25   - <a class="nav-link" data-toggle="tab" href="#panel2" role="tab"><i class="fa fa-envelope"></i> Mail Sender</a>
  25 + <a class="nav-link" data-toggle="tab" href="#panel2" role="tab"><i class="fa fa-envelope"></i> {% trans "Mail Sender" %}</a>
26 26 </li>
27 27 <li class="nav-item">
28   - <a class="nav-link" data-toggle="tab" href="#panel3" role="tab"><i class="fa fa-lock"></i> Security</a>
  28 + <a class="nav-link" data-toggle="tab" href="#panel3" role="tab"><i class="fa fa-lock"></i> {% trans "Security" %}</a>
29 29 </li>
30 30 </ul>
31 31  
... ... @@ -35,7 +35,7 @@
35 35 <div class="tab-pane fade in active" id="panel1" role="tabpanel">
36 36 <div class="panel panel-default">
37 37 <div class="panel-body">
38   - <h3><b>General</b></h3>
  38 + <h3><b>{% trans "General" %}</b></h3>
39 39 <div class="panel panel-default">
40 40 <div class="panel-body">
41 41 Content
... ... @@ -121,7 +121,7 @@
121 121 <hr>
122 122 <div class="form-group label-floating">
123 123 <label class="control-label" for="{{ form.username.auto_id }}">{{ form.username.label }}</label>
124   - <input class="form-control" id="focusedInput1" type="text">
  124 + {% render_field form.username class='form-control' %}
125 125 </div>
126 126 {% if form.username.errors %}
127 127 <div class="alert alert-danger alert-dismissible clearfix" role="alert">
... ... @@ -151,19 +151,53 @@
151 151 </ul>
152 152 </div>
153 153 {% endif %}
  154 + <div class="form-group label-floating">
  155 + <label class="control-label" for="{{ form.default_from_email.auto_id }}">{{ form.default_from_email.label }}</label>
  156 + {% render_field form.default_from_email class='form-control' %}
  157 + </div>
  158 + {% if form.default_from_email.errors %}
  159 + <div class="alert alert-danger alert-dismissible clearfix" role="alert">
  160 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  161 + <span aria-hidden="true">&times;</span>
  162 + </button>
  163 + <ul>
  164 + {% for error in form.default_from_email.errors %}
  165 + <li>{{ error }}</li>
  166 + {% endfor %}
  167 + </ul>
  168 + </div>
  169 + {% endif %}
154 170 <div class="form-group">
155 171 <p><b>{{ form.safe.connection.label }}</b></p>
156 172 <div class="col-md-10">
157 173 <div class="radio radio-primary">
158 174 {% for value, text in form.safe_conection.field.choices %}
159 175 <label>
160   - <input type="radio" name="safe_conection" id="{{ value }}" value="{{ value }}">
  176 + {% if form.safe_conection.value == value %}
  177 + <input type="radio" name="safe_conection" id="{{ value }}" value="{{ value }}" checked="">
  178 + {{ text }}
  179 + {% else %}
  180 + <input type="radio" name="safe_conection" id="{{ value }}" value="{{ value }}">
161 181 {{ text }}
  182 + {% endif %}
  183 +
162 184 </label>
163 185 {% endfor %}
164 186 </div>
165 187 </div>
166 188 </div>
  189 + {% if form.safe_connection.errors %}
  190 + <div class="alert alert-danger alert-dismissible clearfix" role="alert">
  191 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  192 + <span aria-hidden="true">&times;</span>
  193 + </button>
  194 + <ul>
  195 + {% for error in form.safe_connection.errors %}
  196 + <li>{{ error }}</li>
  197 + {% endfor %}
  198 + </ul>
  199 + </div>
  200 + {% endif %}
167 201 </div>
168 202 </div>
169 203 <button type="submit" class="btn btn-success btn-raised">{% trans "Save changes" %}</button>
... ... @@ -180,10 +214,10 @@
180 214 <div class="panel-body">
181 215 <div class="togglebutton">
182 216 <label>
183   - <input type="checkbox" checked> <b>Allow users self-enroll.</b>
  217 + <input type="checkbox" checked> <b>{% trans "Allow users self-enroll." %}</b>
184 218 </label>
185 219 </div>
186   - <button type="button" class="btn btn-primary">Save changes</button>
  220 + <button type="button" class="btn btn-success btn-raised">{% trans "Save changes" %}</button>
187 221 </div>
188 222 </div>
189 223 </div>
... ...