Merge with head.

6 files changed, 32 insertions, 13 deletions

diff --git a/ipa-server/ipa-gui/ipagui/static/css/style.css b/ipa-server/ipa-gui/ipagui/static/css/style.css
index 625eaa54..2515a4bb 100644
--- a/ipa-server/ipa-gui/ipagui/static/css/style.css
+++ b/ipa-server/ipa-gui/ipagui/static/css/style.css
@@ -255,3 +255,18 @@ div.resize-handle {
   left:0;
 }
 
+
+/*
+ * Overrides for printing
+ */
+@media print {
+    #header  { display:none; }
+    #nav     { display:none; }
+    #sidebar { display:none; }
+    #footer  { display:none; }
+    #main_content { width: 95%; margin:0; padding:0; border-left-style: none; }
+
+    .submitbutton { display:none; }
+    .deletebutton { display:none; }
+}
+
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/ipacontroller.py b/ipa-server/ipa-gui/ipagui/subcontrollers/ipacontroller.py
index e003ab96..425df007 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/ipacontroller.py
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/ipacontroller.py
@@ -32,19 +32,19 @@ class IPAController(controllers.Controller):
     def sort_group_member(self, a, b):
         """Comparator function used for sorting group members."""
         if a.getValue('uid') and b.getValue('uid'):
-            if a.getValue('givenname') == b.getValue('givenname'):
-                if a.getValue('sn') == b.getValue('sn'):
+            if a.getValue('sn') == b.getValue('sn'):
+                if a.getValue('givenName') == b.getValue('givenName'):
                     if a.getValue('uid') == b.getValue('uid'):
                         return 0
                     elif a.getValue('uid') < b.getValue('uid'):
                         return -1
                     else:
                         return 1
-                elif a.getValue('sn') < b.getValue('sn'):
+                elif a.getValue('givenName') < b.getValue('givenName'):
                     return -1
                 else:
                     return 1
-            elif a.getValue('givenname') < b.getValue('givenname'):
+            elif a.getValue('sn') < b.getValue('sn'):
                 return -1
             else:
                 return 1
diff --git a/ipa-server/ipa-gui/ipagui/templates/delegateedit.kid b/ipa-server/ipa-gui/ipagui/templates/delegateedit.kid
index a4235830..233d1a24 100644
--- a/ipa-server/ipa-gui/ipagui/templates/delegateedit.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/delegateedit.kid
@@ -10,7 +10,7 @@
     <h2>Edit Delegation</h2>
 
     ${form.display(action=tg.url("/delegate/update"), value=delegate,
-                   actionname='Edit')}
+                   actionname='Update')}
 
 </body>
 </html>
diff --git a/ipa-server/ipa-gui/ipagui/templates/delegateform.kid b/ipa-server/ipa-gui/ipagui/templates/delegateform.kid
index 26d13653..63839434 100644
--- a/ipa-server/ipa-gui/ipagui/templates/delegateform.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/delegateform.kid
@@ -71,7 +71,7 @@
                  value="Cancel ${actionname}"/>
           <br/><br/>
         </td>
-        <td py:if='actionname == "Edit"'>
+        <td py:if='actionname == "Update"'>
           &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 
           <input type="button" class="deletebutton"
                  value="Delete Delegation"
@@ -179,7 +179,7 @@
           <input type="submit" class="submitbutton" name="submit"
                  value="Cancel ${actionname}"/>
         </td>
-        <td py:if='actionname == "Edit"'>
+        <td py:if='actionname == "Update"'>
           <br/>
           &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 
           <input type="button" class="deletebutton"
diff --git a/ipa-server/ipa-gui/ipagui/templates/master.kid b/ipa-server/ipa-gui/ipagui/templates/master.kid
index cf359579..d0c20cfb 100644
--- a/ipa-server/ipa-gui/ipagui/templates/master.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/master.kid
@@ -6,7 +6,7 @@
     <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
     <title py:replace="''">Your title goes here</title>
     <meta py:replace="item[:]"/>
-    <style type="text/css" media="screen">
+    <style type="text/css" media="all">
     @import "${tg.url('/static/css/style.css')}";
     </style>
     <script type="text/javascript" charset="utf-8" src="${tg.url('/static/javascript/prototype.js')}"></script>
diff --git a/ipa-server/ipa-gui/ipagui/templates/usershow.kid b/ipa-server/ipa-gui/ipagui/templates/usershow.kid
index 6250fe6d..9220b974 100644
--- a/ipa-server/ipa-gui/ipagui/templates/usershow.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/usershow.kid
@@ -248,15 +248,19 @@ else:
           <th>
             <label class="fieldlabel" py:content="fields.labeleduri.label" />:
           </th>
-          <td>${user.get("labeleduri")}</td>
+          <td>
+            <a href="${user.get('labeleduri')}">${user.get('labeleduri')}</a>
+          </td>
         </tr>
     </table>
 
     <div class="formsection" py:if='len(user_reports) &gt; 0'>Direct Reports</div>
-    <div py:for="report in user_reports">
-      <a href="${tg.url('/user/show', uid=report.uid)}"
-        >${report.givenname} ${report.sn}</a>
-    </div>
+    <ol>
+      <li py:for="report in user_reports">
+        <a href="${tg.url('/user/show', uid=report.uid)}"
+          >${report.givenname} ${report.sn}</a>
+      </li>
+    </ol>
 
     <div class="formsection">Groups</div>
     <div py:for="group in user_groups">