Changeset 1865 for trunk/LATMOS-Accounts-Web/root

Timestamp:

12/21/16 15:07:28 (8 years ago)

Author:

nanardon

Message:

Merge branch

Location:

trunk/LATMOS-Accounts-Web/root/html

Files:

• includes/sidebar.tt (modified) (1 diff)
• oaliases (added)
• oaliases/Create.tt (added)
• oaliases/Edit.tt (added)
• oaliases/index.tt (added)
• users/address_form.tt (modified) (1 diff)

trunk/LATMOS-Accounts-Web/root/html/includes/sidebar.tt

@@ -64 +64 @@
     <li class="ui-widget-header"><a href="[% c.uri_for('/stat') %]">[% l('Statistics') %]</a>:
     [% END %]
-    <li><a href="[% c.uri_for('/stat', stat) %]">[% ostat.get_attributes('description') || stat | html %]</a></li>
+    <li><a href="[% c.uri_for('/stat', stat) %]">[% ostat.get_attributes('description') || stat | html %]</a>
+    </li>
+
     [% IF loop.last %]
     </li>
     [% END %]
     [% END %]
-
+    
+    [% IF c.model('Accounts').db.search_objects('stat', 'exported=true', 'display=*').sort %]
+    <li><a href="[% c.uri_for('/stat') %]">[% l('Others Statistics') %]</a>
+    </li>
+    [% END %]
     </ul>
 </li>

trunk/LATMOS-Accounts-Web/root/html/users/address_form.tt

@@ -38 +38 @@
 [% END %]
 
+<tr>
+    <th>
+        [% form.attr_label('expire') %]
+
+        [% IF form.attr_hint('expire') %]
+        <span
+            title="[% form.attr_hint('expire') | html %]"
+            class="hint">?</span>
+        [% END %]
+    </th>
+    <td>[% form.attr_field('expire') %]</td>
+</tr>
 [% IF NOT c.req.param('add_addr') %]
 <tr>