Changeset 1211

Timestamp:

01/02/13 17:56:28 (11 years ago)

Author:

nanardon

Message:

display improvement

Location:

trunk/LATMOS-Accounts-Web/root

Files:

• html/groups/dpmt.tt (modified) (2 diffs)
• html/groups/users.tt (modified) (2 diffs)
• html/includes/form.tt (modified) (1 diff)
• html/login.tt (modified) (2 diffs)
• html/nethosts/default.tt (modified) (2 diffs)
• html/users/address.tt (modified) (6 diffs)
• html/users/groups.tt (modified) (1 diff)
• html/users/mail.tt (modified) (1 diff)
• html/users/my.tt (modified) (1 diff)
• html/users/passwd.tt (modified) (4 diffs)
• static/struct.css (modified) (1 diff)
• static/style.css (modified) (3 diffs)

trunk/LATMOS-Accounts-Web/root/html/groups/dpmt.tt

@@ -7 +7 @@
 
 <div class="objectform" id="objectform">
-<div id="oform">
 
 <div style="margin: 2em; border: outset;">
@@ -70 +69 @@
 
 </div>
-</div>
 [% END %]
-
-
-

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

@@ -10 +10 @@
 
 <div class="objectform" id="objectform">
-<div id="oform">
 <table border=1>
 <tr><th>Membres:</th><th>Ajouter:</th></tr>
@@ -77 +76 @@
 </tr>
 </table>
-</div>
 
 </div>

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

@@ -5 +5 @@
 [% FOREACH attr =  attributes %]
 [% IF loop.first %]
+<h2>
+    [% form.label | html %]:
+</h2>
 <form action="[% form_uri | html %]" method="POST">
 <table border=1>
-<tr><th colspan=2>
-    [% form.label | html %]
-</th></tr>
 [% END %]
 <tr>

trunk/LATMOS-Accounts-Web/root/html/login.tt

@@ -1 +1 @@
 <div id="login">
 <form action="[% c.uri_for('/login') %]" method="POST">
-<p>Vous devez vous connecter:</p>
 <input type="hidden" name="loguri" value="[% redirurl | html %]">
 <table border="0" align="center">
 <tr>
+<tr><td colspan=2>Vous devez vous connecter:</td></tr>
 <th>Login:</th><td><input type="text" name="username" value="[% c.req.param('username') | html %]"></td>
 </tr>
@@ -10 +10 @@
 <th>Password:</th><td><input type="password" name="password"></td>
 </tr>
+<tr><td></td><td><input type="submit"></td></tr>
 </table>
-<input type="submit">
 </form>
 </div>

trunk/LATMOS-Accounts-Web/root/html/nethosts/default.tt

@@ -11 +11 @@
     form_uri = c.uri_for(nethostname) %]
 
-<div class="oform">
 <table border=1>
 [% IF c.model('Accounts').db.check_acl('netzone', 'name', 'r') %]
@@ -65 +64 @@
 </table>
 </div>
-</div>
 
 [% END %]

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

@@ -7 +7 @@
 
 <div id="objectform" class="objectform">
-<table border="0">
+<h2>Adresses postales:</h2>
+<table border="0" id="user_address_list">
     [% FOREACH idaddress = user.get_c_field('otheraddress') %]
     [% laddress = c.model('Accounts').db.get_object('address', idaddress) %]
     <tr>
-    <!---  <td>[% IF laddress.get_c_field('isMainAddress') %]
-        Principale
-        [% END %]</td>
-    -->
-        <td>
+        <td class=user_address_cel>
 
+            [% loop.count %]:
             [% IF address.id != idaddress %]
             <a href="[% c.uri_for(username, subform, idaddress) %]">
@@ -23 +21 @@
             <span [% 'class="unexported"' IF laddress.get_c_field('unexported') %]>
             [% "<b>" IF laddress.get_c_field('isMainAddress') %]
-            [% laddress.get_c_field('l') || idaddress | html %]
+            [% laddress.get_c_field('l') || 'N/A' | html %]
             [% IF laddress.get_c_field('physicalDeliveryOfficeName') %]
             - [% laddress.get_c_field('physicalDeliveryOfficeName') | html %]
@@ -37 +35 @@
 
         [% IF laddress.base.check_acl(laddress, '@DELETE', 'w') %]
-        <td>
         <form action="[% c.uri_for(username, subform) %]" method="POST"
             style="display:inline">
@@ -70 +67 @@
     [% IF c.model('Accounts').db.check_acl(user, 'l', 'w') &&
           c.model('Accounts').db.check_acl('address', '@CREATE', 'w') %]
-    <tr><td colspan=2 align="center">
+    <tr><td colspan=3 align="center">
     <form action="[% c.uri_for(username, subform) %]" method="POST">
     <input type="hidden" name="add_addr" value="1">
@@ -82 +79 @@
 
 [% IF address %]
-<div id="oform">
-
 
 <form action="[% c.uri_for(username, subform, address.id) %]" method="POST">
@@ -89 +84 @@
 </form>
 
-</div>
 [% END %][% # IF address %]
 

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

@@ -6 +6 @@
 [% INCLUDE 'users/object_header.tt' %]
 
+
 <div id="objectform" class="objectform">
+<h2>Appartenance aux groupes:</h2>
 [% modallow = c.model('Accounts').db.check_acl(user, 'memberOf', 'w') %]
 

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

@@ -7 +7 @@
 
 <div id="objectform" class="objectform">
+
+<h2>E-mails:</h2>
 
 <form action="[% c.uri_for(user.id, 'mail') %]" method="POST">

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

@@ -7 +7 @@
 
 <div id="objectform" class="objectform">
-<div class="oform">
 
 [% FOREACH reqid = db.list_request_by_object('user', username) %]

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

@@ -14 +14 @@
 
 <div id="objectform" class="objectform">
-<div id="oform">
+<h2>
+[%- IF c.user.username != username -%]Changer le mot de passe de [% username -%]
+[%- ELSE -%]Changer mon mot de passe
+[%- END -%]:
+</h2>
+
 [% IF c.model('Accounts').db.check_acl(user, 'userPassword', 'w') %]
 
@@ -31 +36 @@
 </form>
 
-<fieldset>
-<legend>Mot de passe aléatoire</legend>
+<p>Pas d'idée ?</p>
+<p>Cliquez que générer pour obtenir un mot aléatoire. Il doit être taper et non
+copier/coller. Pensez à le noter.</p>
+
 [% c.prototype.form_remote_tag({
     update => 'randpasswd',
@@ -38 +45 @@
 } ) %]
 <input type=submit value="Générer !">
-<span id="randpasswd">Ici, votre mot de passe</span>
-<br>
-<input type=checkbox name=nonalpha value="1">Utiliser des caractÚres non
-alpha-numérique<br>
-<input type=checkbox name=syllables value="1">Utiliser des syllabes plutÃŽt que
-des lettres<br>
+<span id="randpasswd">----</span>
+<ul id="randpasswd_options">
+<li><input type=checkbox name=nonalpha value="1">Utiliser des caractÚres non
+alpha-numérique</li>
+<li><input type=checkbox name=syllables value="1">Utiliser des syllabes plutÃŽt que
+des lettres</li>
+</ul>
 </form>
-</fieldset>
 
 [% ELSE %]
@@ -51 +58 @@
 [% END %]
 </div>
-</div>

trunk/LATMOS-Accounts-Web/root/static/struct.css

@@ -14 +14 @@
 #mainbox {
     width: 78%;
-    padding: 0.2em;
-    float: left;
+    padding: 0em;
+    float: right;
 }
 

trunk/LATMOS-Accounts-Web/root/static/style.css

@@ -77 +77 @@
     padding: 0em;
     background-color: #7DB4D8;
+}
+
+#mainbox {
+    margin-top:    0.2em;
+    margin-bottom: 0.2em;
 }
 
@@ -173 +178 @@
 }
 
+#user_address_list {
+    border: outset;
+}
+#user_address_list td {
+    padding-bottom: 0.5em;
+    padding-top:    0.5em;
+}
+#user_address_list td.user_address_cel {
+    padding-bottom: 0.5em;
+    padding-top:    0.5em;
+    padding-right:  1em;
+}
+
+/* box receiving random password */
+span#randpasswd {
+    padding: 0.3em;
+    margin: 0.3em;
+    border: inset;
+    font-family: monospace;
+    font-size: 1.5em;
+    background-color: black;
+    color: green;
+}
+
+/* Random password options list */
+ul#randpasswd_options {
+    list-style-type: none;
+    padding-top: 0.2em;
+    padding-left: 0em;
+} 
+
+div#objectform {
+    padding-top: 1em;
+    padding-bottom: 1em;
+}
+
+
     /*
 
@@ -197 +239 @@
     margin: 0em;
 }
-*/
-/*
-
-div.objectform  {
-}
-
-
-.oform ul {
-    padding: 0.5em;
-}
-
-.oform li {
-    list-style-type: none;
-    padding-left: 0.2em;
-}
-
-*/
-/*
+
 .inputvalidate img {
     width: 1em;