accounts2/fas/fas/templates editAccount.kid, 1.7, 1.8 groupList.kid, 1.4, 1.5 master.kid, 1.3, 1.4 signUp.kid, 1.1, 1.2

Michael Patrick McGrath (mmcgrath) fedora-extras-commits at redhat.com
Thu Apr 26 18:31:14 UTC 2007


Author: mmcgrath

Update of /cvs/fedora/accounts2/fas/fas/templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10076/templates

Modified Files:
	editAccount.kid groupList.kid master.kid signUp.kid 
Log Message:
Major UI changes, some library additions


Index: editAccount.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/editAccount.kid,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- editAccount.kid	26 Apr 2007 14:28:20 -0000	1.7
+++ editAccount.kid	26 Apr 2007 18:31:11 -0000	1.8
@@ -25,12 +25,12 @@
     <tr>
         <td>Real Name:</td>
         <td>
-            <div id='givenName'>${user.givenName} <a href='' onclick="formEdit('givenName'); return false;">(edit)</a></div>
+            <div id='givenName'>${user.givenName} <a href="" onclick="formEdit('givenName'); return false;">(edit)</a></div>
             <div id='givenNameForm' style='display: none'>
                 <form method='post' action='editUserAttribute'>
                     <input type='hidden' name='attribute' value='givenName'/>
                     <input type='text' name='value' value='${user.givenName}'/>
-                    <a href='editAccount' onclick="cancelEdit('givenName'); return false;">(cancel)</a>
+                    <a href='' onclick="cancelEdit('givenName'); return false;">(cancel)</a>
                 </form>
             </div>
         </td>


Index: groupList.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/groupList.kid,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- groupList.kid	26 Apr 2007 14:28:20 -0000	1.4
+++ groupList.kid	26 Apr 2007 18:31:11 -0000	1.5
@@ -26,7 +26,7 @@
         <td><a href='?search=*'>All</a></td>
     </tr>
 </table>
-<table id='sortable_table' class='datagrid'>
+<table py:if="groups" id='sortable_table' class='datagrid'>
     <thead>
     <tr><th mochi:format="str">Group</th><th mochi:format='istr'>Status</th></tr>
     </thead>


Index: master.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/master.kid,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- master.kid	26 Apr 2007 14:28:20 -0000	1.3
+++ master.kid	26 Apr 2007 18:31:11 -0000	1.4
@@ -22,7 +22,64 @@
 </head>
 
 <body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">
-    <div py:if="tg.config('identity.on',False) and not 'logging_in' in locals()"
+    <div id="wrapper">
+      <div id="head">
+        <h1><a href="/">Fedora</a></h1>
+        <div py:if="tg_flash" class="flash" id='flashMessage'>
+            ${tg_flash}<a href='' onClick="squish('flashMessage'); return false;">(hide)</a>
+        </div>
+        <div id="searchbox">
+          <form action="" method="get">
+            <label for="q">Search:</label>
+            <input type="text" name="q" id="q"/>
+            <input type="submit" value="Search"/>
+          </form>
+        </div>
+      </div>
+      <div id="topnav">
+        <ul>
+          <li class="first"><a href="/">Learn about Fedora</a></li>
+          <li><a href="/">Download Fedora</a></li>
+          <li><a href="/">Projects</a></li>
+          <li><a href="/">Join Fedora</a></li>
+          <li><a href="/">Communicate</a></li>
+          <li><a href="/">Help/Documentation</a></li>
+        </ul>
+      </div>
+      <div id="infobar">
+        <div id="authstatus">
+          <span py:if="not tg.identity.anonymous">
+            <strong>Logged in: </strong>${tg.identity.user.user_name}.
+          </span>
+        </div>
+        <div id="control">
+          <ul>
+            <li py:if="not tg.identity.anonymous"><a href="editAccount">My Account</a></li>
+            <li py:if="not tg.identity.anonymous"><a href="logout">Log Out</a></li>
+            <li py:if="tg.identity.anonymous"><a href="login">Log In</a></li>
+          </ul>
+        </div>
+      </div>
+      <div id="main">
+        <div id="sidebar">
+          <ul>
+            <li class="first"><a href="listGroup">Group List</a></li>
+            <li><a href="news">News</a></li>
+            <li><a href="/">Return of the Son of Nav Item</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+
+
+
+
+
+
+
+
+
+<!--    <div py:if="tg.config('identity.on',False) and not 'logging_in' in locals()"
         id="pageLogin">
         <span py:if="tg.identity.anonymous">
             <a href="${tg.url('/login')}">Login</a>
@@ -31,20 +88,9 @@
             Welcome ${tg.identity.user.user_name}.
             <a href="${tg.url('/logout')}">Logout</a>
         </span>
-    </div>
+    </div>-->
     <div id="header">&nbsp;</div>
     <div id="main_content">
-    <div id="menu_items" py:if="not tg.identity.anonymous">
-        <table><tr><td><a href='listGroup'>List Groups</a></td><td><a href='editAccount'>Edit Account</a></td><td><a href='listUser'>List Users</a></td><td><a href='#'>News</a></td></tr></table>
-    </div>
-    <div py:if="tg_flash" class="flash" id='flashMessage'>
-    <table class="account-info">
-        <tr>
-            <th></th><td py:content='tg_flash'></td><td><a href='' onClick="squish('flashMessage'); return false;">(hide)</a></td>
-        </tr>
-    </table>
-    </div>
-
     <div py:replace="[item.text]+item[:]"/>
 
 	<!-- End of main_content -->


Index: signUp.kid
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/templates/signUp.kid,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- signUp.kid	26 Apr 2007 14:28:20 -0000	1.1
+++ signUp.kid	26 Apr 2007 18:31:11 -0000	1.2
@@ -13,14 +13,14 @@
 <div class='draggable white' style="left: 10px; display: none" id='help'>close</div>
 <script src="/fas/static/javascript/forms.js" type="text/javascript"></script>
 
-<form>
+<form action='newAccount' method='post'>
     <table>
         <tr><td>username:</td><td><input type='text' name='cn'/></td></tr>
         <tr><td>Real Name:</td><td><input type='text' name='givenName'/></td></tr>
         <tr><td>email:</td><td><input type='text' name='mail'/></td></tr>
         <tr><td>Telephone Number:</td><td><input type='text' name='telephoneNumber'/></td></tr>
         <tr><td>Postal Address:</td><td><textarea name='postalAddressForm'></textarea></td></tr>
-        
+        <tr><td><input type='submit'/></td><td></td></tr>
     </table>
 </form>
 




More information about the scm-commits mailing list