Changeset 911

Timestamp:

02/24/12 15:28:19 (12 years ago)

Author:

nanardon

Message:

• improve the users/address page

Location:

LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Users.pm (modified) (2 diffs)
• root/html/users/address.tt (modified) (2 diffs)
• root/html/users/address_list.tt (deleted)
• root/html/users/addresses.tt (deleted)
• root/static/icons/emblem-favorite.png (added)
• root/static/style.css (modified) (1 diff)

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm

@@ -128 +128 @@
             if ($arg) {
                 $c->stash->{address} = $base->get_object('address', $arg);
-                $c->stash->{form} = $c->model('AttrForms', 'address',
-                    $c->stash->{address});
-                $c->stash->{template} = 'users/address.tt';
-                $c->stash->{form}->set_attrs;
             } else {
-                $c->stash->{form} = $c->model('AttrForms', 'address', 'address',
-                    $base);
+
                 if ($c->req->param('delete')) {
                     $base->delete_object('address', $c->req->param('delete'));
                     $base->commit;
-                } elsif ($c->req->param('create')) {
+                } elsif ($c->req->param('add_addr')) {
+                    $c->stash->{form} = $c->model('AttrForms', 'address', 'address',
+                        $base);
                     my $addname = $username . join('', map
                         {('a'..'z')[rand(26)]}(0..4));
@@ -152 +149 @@
                         return;
                     }
+                } elsif ($c->req->param('main')) {
+                    if (my $ad = $base->get_object('address',
+                            $c->req->param('main'))) {
+                        warn $c->req->param('main');
+                        warn $ad->set_c_fields('isMainAddress' => 1);
+                        $ad->base->commit;
+                    }
                 }
-                $c->stash->{template} = 'users/addresses.tt';
-            }
+
+                my ($main) = $c->stash->{user}->get_attributes('otheraddress');
+                $c->stash->{address} = $base->get_object('address', $main);
+            }
+            if ($c->stash->{address}) {
+                $c->stash->{form} = $c->model('AttrForms', 'address',
+                    $c->stash->{address});
+                $c->stash->{form}->set_attrs;
+            }
+            $c->stash->{template} = 'users/address.tt';
+
             last;
         };

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

@@ -7 +7 @@
 [% INCLUDE 'users/menu.tt' %]
 
+<div style="padding:2em; border:outset">
+<table border="0">
+    [% 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>
+            [% IF address.id != idaddress %]
+            <a href="[% c.uri_for(username, subform, idaddress) %]">
+            [% END %]
+            [% "<b>" IF laddress.get_c_field('isMainAddress') %]
+            [% laddress.get_c_field('l') || idaddress | html %]
+            [% IF laddress.get_c_field('physicalDeliveryOfficeName') %]
+            - [% laddress.get_c_field('physicalDeliveryOfficeName') | html %]
+            [% END %]
+            [% IF address.id != idaddress %]
+            [% "</b>" IF laddress.get_c_field('isMainAddress') %]
+            </a>
+            [% END %]
+        </td>
+        <td align="center">
+
+        [% IF laddress.base.check_acl(laddress, '@DELETE', 'w') %]
+        <td>
+        <form action="[% c.uri_for(username, subform) %]" method="POST"
+            style="display:inline">
+        <input type="hidden" name="delete" value="[% laddress.id | html %]">
+        <input type="image" value="Effacer" title="Supprimer" alt="effacer"
+            src="[% c.uri_for('/static', 'images', 'edit-delete.png') %]"
+            class="attr"
+        >
+        </form>
+        </td>
+        [%- END -%]
+
+        [%- IF laddress.base.check_acl(laddress, 'isMainAddress', 'w') -%]
+        [% IF NOT laddress.get_c_field('isMainAddress') %]
+        <td>
+        <form action="[% c.uri_for(username, subform) %]" method="POST"
+            style="display:inline;">
+        <input type="hidden" name="main" value="[% laddress.id | html %]">
+        <input type="image" value="" title="Passer en principale" alt="effacer"
+            src="[% c.uri_for('/static', 'icons', 'emblem-favorite.png') %]"
+            class="attr"
+            style="display:inline;"
+        >
+        </form>
+        </td>
+        [% END %]
+        [% END %]
+
+    </tr>
+    [% END %]
+    [% IF NOT c.req.param('add_addr') %]
+    [% 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">
+    <form action="[% c.uri_for(username, subform) %]" method="POST">
+    <input type="hidden" name="add_addr" value="1">
+    <input type="submit" value="Ajouter une addresse">
+    </form>
+    </td></tr>
+    [% END %]
+    [% END %]
+    </table>
+</div>
+
+
+[% IF address %]
 <div id="oform">
 
-[% # INCLUDE 'users/address_list.tt' %]
+<p style="text-align:center"><img src="[% c.uri_for('/static', 'images', 'view-pim-contacts.png') %]">
+[% IF  address.get_c_field('isMainAddress') %]
 
-<div style="border:outset">
-<p style="text-align:center"><img src="[% c.uri_for('/static', 'images', 'view-pim-contacts.png') %]">
+        <img src="[% c.uri_for('/static', 'icons', 'gtk-home.png') %]"
+            title="Adresse principale" alt="Adresse principale"
+        >
+[% END %]
 [% address.get_c_field('l') | html %]
+[% IF address.get_c_field('physicalDeliveryOfficeName') %]
+- [% address.get_c_field('physicalDeliveryOfficeName') | html %]
+[% END %]
 </p>
 
@@ -20 +98 @@
 </form>
 
-[% IF address.base.check_acl(address, '@DELETE', 'w') %]
-<table border=1><tr><td align="center">
-<form action="[% c.uri_for(username, subform) %]" method="POST">
-<input type="hidden" name="delete" value="[% address.id | html %]">
-<input type="image" value="Effacer" title="Supprimer" alt="effacer" src="[%
-c.uri_for('/static', 'images', 'edit-delete.png') %]"><br>
-Supprimer cette adresse
-</form>
-</td></tr></table>
-[% END %]
+</div>
+[% END %][% # IF address %]
 
 </div>
-</div>
-</div>
 [% END %]
-

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

@@ -192 +192 @@
     vertical-align: middle;
 }
+input.attr {
+    width: 1.5em;
+    height:1.5em;
+    vertical-align: middle;
+}
 
 span.hint {
-    /*
-     * width:  2em;
-     * height: 2em;
-    */
     vertical-align: super;
 }