New permissions layout.

diff --git a/kronolith/templates/chunks/calendar.php b/kronolith/templates/chunks/calendar.php
index 89edd83..e470925 100644 (file)
--- a/kronolith/templates/chunks/calendar.php
+++ b/kronolith/templates/chunks/calendar.php
@@ -46,47 +46,55 @@
 
 <div id="kronolithCalendarinternalTabPerms" class="kronolithTabsOption" style="display:none">
   <div id="kronolithCalendarPermsBasic">
-    <?php echo _("Share this calendar with:") ?><br />
-    <dl>
-      <dt><label for="kronolithCalendarPermsAll">
-        <input type="checkbox" id="kronolithCalendarPermsAll" name="share_with_all" />
-        <?php echo _("Everyone") ?>
-      </label></dt>
-      <dd><label for="kronolithCalendarPermsShow">
-        <input type="checkbox" id="kronolithCalendarPermsShow" name="share_show" disabled="disabled" />
-        <?php echo _("and make it searchable for everyone too") ?>
-      </label></dd>
-    </dl>
-    <dl id="kronolithCalendarPermsGroups">
-      <dt>
+    <div class="kronolithDialogInfo"><?php printf(_("%s Standard sharing. %s You can also set %s advanced sharing %s options."), '<strong>', '</strong>', '<strong><a href="#" id="kronolithCalendarPermsMore">', '</a></strong>') ?></div>
+    <div>
+      <input type="radio" id="kronolithCalendarPermsNone" name="share_with" value="none" checked="checked" />
+      <label for="kronolithCalendarPermsNone"><?php echo _("Don't share this calendar") ?></label><br />
+      <?php echo _("or share with") ?>
+      <input type="checkbox" id="kronolithCalendarPermsAll" name="share_with_all" />
+      <label for="kronolithCalendarPermsAll"><?php echo _("everyone") ?></label>
+      (<?php echo _("and") ?>
+      <input type="checkbox" id="kronolithCalendarPermsShow" name="share_show" disabled="disabled" />
+      <?php printf(_("%s make it searchable %s by everyone too"), '<label for="kronolithCalendarPermsShow">', '</label>') ?>)<br />
+      <span id="kronolithCalendarPermsGroups">
+        <?php echo _("or share with") ?>
+        <input type="checkbox" id="kronolithCalendarPermsGroup" name="share_with_group" />
         <label for="kronolithCalendarPermsGroup">
-          <input type="checkbox" id="kronolithCalendarPermsGroup" name="share_with_group" />
+          <?php echo _("the") ?>
           <span id="kronolithCalendarPermsSingleGroup"></span>
         </label>
-        <span id="kronolithCalendarPermsGroupList">
-          <select name="share_groups">
-            <option>Group one</option>
-            <option>Soccer team</option>
-            <option>Family</option>
-          </select>
-        </span>
-      </dt>
-      <dd>
-        <label>
-          <?php echo _("and allow them to") ?>
-          <select id="kronolithCalendarPermsGroupPerms" name="share_group_perms" disabled="disabled">
-            <option value="read"><?php echo _("read the events") ?></option>
-            <option value="edit"><?php echo _("read and edit the events") ?></option>
-          </select>
+          <span id="kronolithCalendarPermsGroupList">
+            <select name="share_groups">
+              <option>Group one</option>
+              <option>Soccer team</option>
+              <option>Family</option>
+            </select>
+          </span>
+        <label for="kronolithCalendarPermsGroup">
+          <?php echo _("group") ?>
         </label>
-      </dd>
-    </dl>
-    <a href="#" id="kronolithCalendarPermsMore"><?php echo _("More >>>") ?></a>
+        <?php printf(_("and %s allow them to %s"), '<label for="kronolithCalendarPermsGroupPerms">','</label>') ?>
+        <select id="kronolithCalendarPermsGroupPerms" name="share_group_perms" disabled="disabled">
+          <option value="read"><?php echo _("read the events") ?></option>
+          <option value="edit"><?php echo _("read and edit the events") ?></option>
+        </select><br />
+      </span>
+    </div>
   </div>
   <div id="kronolithCalendarPermsAdvanced" style="display:none">
-    <label>
-      <?php echo _("Owner:") ?>
+    <div class="kronolithDialogInfo"><?php printf(_("%s Advanced sharing. %s You can also return to the %s standard settings. %s"), '<strong>', '</strong>', '<strong><a href="#" id="kronolithCalendarPermsLess">', '</a></strong>') ?></div>
+    <div>
+    <table width="100%" cellspacing="0" cellpadding="0" border="0">
+      <thead>
+        <tr valign="middle">
+          <th colspan="2"><?php echo _("Calendar owner") ?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+         <td>
       <?php if ($auth->hasCapability('list') && ($GLOBALS['conf']['auth']['list_users'] == 'list' || $GLOBALS['conf']['auth']['list_users'] == 'both')): ?>
+      <label for="owner_select"><?php echo Horde::img('user.png', '', '', $GLOBALS['registry']->getImageDir('horde')) . '&nbsp;' . _("User:") ?></label>
       <select id="owner_select" name="owner_select">
         <option value=""><?php echo _("Select a new owner:") ?></option>
         <option value="" selected="selected"><?php echo htmlspecialchars(Horde_Auth::getAuth()) ?></option>
@@ -95,18 +103,21 @@
         <?php endforeach; ?>
       </select>
       <?php else: ?>
-      <input type="text" id="owner_input" name="owner_input" value="<?php echo htmlspecialchars(Horde_Auth::getAuth()) ?>" />
+      <label for="owner_input"><?php echo Horde::img('user.png', '', '', $GLOBALS['registry']->getImageDir('horde')) . '&nbsp;' . _("User:") ?></label>
+      <input type="text" id="owner_input" name="owner_input" size="50" value="<?php echo htmlspecialchars(Horde_Auth::getAuth()) ?>" />
       <?php endif; ?>
-    </label>
-    <table border="1" style="border: 1px solid #ddd">
-      <thead><tr valign="middle">
-        <th>&nbsp;</th>
-        <th><?php echo _("Show") ?></th>
-        <th><?php echo _("Read") ?></th>
-        <th><?php echo _("Edit") ?></th>
-        <th><?php echo _("Delete") ?></th>
-        <th><?php echo _("Delegate") ?></th>
-      </tr></thead>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    </div>
+    <table width="100%" cellspacing="0" cellpadding="0" border="0">
+      <thead>
+        <tr valign="middle">
+          <th><?php echo _("Sharing") ?></th>
+          <th colspan="5"><?php echo _("Permissions") ?></th>
+        </tr>
+      </thead>
 
       <?php if (Horde_Auth::isAdmin() || !empty($GLOBALS['conf']['shares']['world'])): ?>
       <!-- Default Permissions -->
@@ -114,23 +125,23 @@
         <td><?php echo Horde::img('perms.png', '', '', $GLOBALS['registry']->getImageDir('horde')) . '&nbsp;' . _("All Authenticated Users") ?></td>
         <td>
           <input type="checkbox" id="default_show" name="default_show" />
-          <label for="default_show" class="hidden"><?php echo _("Show") ?></label>
+          <label for="default_show"><?php echo _("Show") ?></label>
         </td>
         <td>
           <input type="checkbox" id="default_read" name="default_read" />
-          <label for="default_read" class="hidden"><?php echo _("Read") ?></label>
+          <label for="default_read"><?php echo _("Read") ?></label>
         </td>
         <td>
           <input type="checkbox" id="default_edit" name="default_edit" />
-          <label for="default_edit" class="hidden"><?php echo _("Edit") ?></label>
+          <label for="default_edit"><?php echo _("Edit") ?></label>
         </td>
         <td>
           <input type="checkbox" id="default_delete" name="default_delete" />
-          <label for="default_delete" class="hidden"><?php echo _("Delete") ?></label>
+          <label for="default_delete"><?php echo _("Delete") ?></label>
         </td>
         <td>
           <input type="checkbox" id="default_delegate" name="default_delegate" />
-          <label for="default_delegate" class="hidden"><?php echo _("Delegate") ?></label>
+          <label for="default_delegate"><?php echo _("Delegate") ?></label>
         </td>
       </tr>
 
@@ -139,23 +150,23 @@
         <td><?php echo _("Guest Permissions") ?></td>
         <td>
           <input type="checkbox" id="guest_show" name="guest_show" />
-          <label for="guest_show" class="hidden"><?php echo _("Show") ?></label>
+          <label for="guest_show"><?php echo _("Show") ?></label>
         </td>
         <td>
           <input type="checkbox" id="guest_read" name="guest_read" />
-          <label for="guest_read" class="hidden"><?php echo _("Read") ?></label>
+          <label for="guest_read"><?php echo _("Read") ?></label>
         </td>
         <td>
           <input type="checkbox" id="guest_edit" name="guest_edit" />
-          <label for="guest_edit" class="hidden"><?php echo _("Edit") ?></label>
+          <label for="guest_edit"><?php echo _("Edit") ?></label>
         </td>
         <td>
           <input type="checkbox" id="guest_delete" name="guest_delete" />
-          <label for="guest_delete" class="hidden"><?php echo _("Delete") ?></label>
+          <label for="guest_delete"><?php echo _("Delete") ?></label>
         </td>
         <td>
           <input type="checkbox" id="guest_delegate" name="guest_delegate" />
-          <label for="guest_delegate" class="hidden"><?php echo _("Delegate") ?></label>
+          <label for="guest_delegate"><?php echo _("Delegate") ?></label>
         </td>
       </tr>
       <?php endif; ?>
@@ -165,23 +176,23 @@
         <td><?php echo Horde::img('user.png', '', '', $GLOBALS['registry']->getImageDir('horde')) . '&nbsp;' . _("Object Creator") ?></td>
         <td>
           <input type="checkbox" id="creator_show"  name="creator_show" />
-          <label for="creator_show" class="hidden"><?php echo _("Show") ?></label>
+          <label for="creator_show"><?php echo _("Show") ?></label>
         </td>
         <td>
           <input type="checkbox" id="creator_read" name="creator_read" />
-          <label for="creator_read" class="hidden"><?php echo _("Read") ?></label>
+          <label for="creator_read"><?php echo _("Read") ?></label>
         </td>
         <td>
           <input type="checkbox" id="creator_edit" name="creator_edit" />
-          <label for="creator_edit" class="hidden"><?php echo _("Edit") ?></label>
+          <label for="creator_edit"><?php echo _("Edit") ?></label>
         </td>
         <td>
           <input type="checkbox" id="creator_delete" name="creator_delete" />
-          <label for="creator_delete" class="hidden"><?php echo _("Delete") ?></label>
+          <label for="creator_delete"><?php echo _("Delete") ?></label>
         </td>
         <td>
           <input type="checkbox" id="creator_delegate" name="creator_delegate" />
-          <label for="creator_delegate" class="hidden"><?php echo _("Delegate") ?></label>
+          <label for="creator_delegate"><?php echo _("Delegate") ?></label>
         </td>
       </tr>
 
@@ -194,23 +205,23 @@
         </td>
         <td>
           <input type="checkbox" id="u_show_new_input" name="u_show[||new_input]" />
-          <label for="u_show_new_input" class="hidden"><?php echo _("Show") ?></label>
+          <label for="u_show_new_input"><?php echo _("Show") ?></label>
         </td>
         <td>
           <input type="checkbox" id="u_read_new_input" name="u_read[||new_input]" />
-          <label for="u_read_new_input" class="hidden"><?php echo _("Read") ?></label>
+          <label for="u_read_new_input"><?php echo _("Read") ?></label>
         </td>
         <td>
           <input type="checkbox" id="u_edit_new_input" name="u_edit[||new_input]" />
-          <label for="u_edit_new_input" class="hidden"><?php echo _("Edit") ?></label>
+          <label for="u_edit_new_input"><?php echo _("Edit") ?></label>
         </td>
         <td>
           <input type="checkbox" id="u_delete_new_input" name="u_delete[||new_input]" />
-          <label for="u_delete_new_input" class="hidden"><?php echo _("Delete") ?></label>
+          <label for="u_delete_new_input"><?php echo _("Delete") ?></label>
         </td>
         <td>
           <input type="checkbox" id="u_delegate_new_input" name="u_delegate[||new_input]" />
-          <label for="u_delegate_new_input" class="hidden"><?php echo _("Delegate") ?></label>
+          <label for="u_delegate_new_input"><?php echo _("Delegate") ?></label>
         </td>
       </tr>
 
@@ -228,27 +239,26 @@
         </td>
         <td>
           <input type="checkbox" id="g_show_new" name="g_show[||new]" />
-          <label for="g_show_new" class="hidden"><?php echo _("Show") ?></label>
+          <label for="g_show_new"><?php echo _("Show") ?></label>
         </td>
         <td>
           <input type="checkbox" id="g_read_new" name="g_read[||new]" />
-          <label for="g_read_new" class="hidden"><?php echo _("Read") ?></label>
+          <label for="g_read_new"><?php echo _("Read") ?></label>
         </td>
         <td>
           <input type="checkbox" id="g_edit_new" name="g_edit[||new]" />
-          <label for="g_edit_new" class="hidden"><?php echo _("Edit") ?></label>
+          <label for="g_edit_new"><?php echo _("Edit") ?></label>
         </td>
         <td>
           <input type="checkbox" id="g_delete_new" name="g_delete[||new]" />
-          <label for="g_delete_new" class="hidden"><?php echo _("Delete") ?></label>
+          <label for="g_delete_new"><?php echo _("Delete") ?></label>
         </td>
         <td>
           <input type="checkbox" id="g_delegate_new" name="g_delegate[||new]" />
-          <label for="g_delegate_new" class="hidden"><?php echo _("Delegate") ?></label>
+          <label for="g_delegate_new"><?php echo _("Delegate") ?></label>
         </td>
       </tr>
     </table>
-    <a href="#" id="kronolithCalendarPermsLess"><?php echo _("<<< Less") ?></a>
   </div>
 </div>