# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2010-07-27 12:48:13
# Node ID 0f35fa0f4eb82ce082c07208ea5da6e2f39c2f83
# Parent  ec7b76d4bda4f3c8d19af791069f98fa592fc147

fixed some html and styles, added owner into admin repo list
added alert message when using ajax remove user command in permissions

diff --git a/pylons_app/public/css/style.css b/pylons_app/public/css/style.css
--- a/pylons_app/public/css/style.css
+++ b/pylons_app/public/css/style.css
@@ -2616,7 +2616,7 @@ div.options a:hover
 {
 	margin: 2px 10px 0 0;
 	padding: 5px 0 0 5px;
-	width: 82px;
+	width: 100px;
 	float: left;
     text-align: right;
 }
@@ -2647,7 +2647,7 @@ div.options a:hover
 {
     margin: 0;
     padding: 7px 7px 6px 7px;
-    width: 266px;
+    width: 245px;
     background: #FFFFFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
@@ -3316,7 +3316,13 @@ table#permissions_manage{
 
 }
 table#permissions_manage span.private_repo_msg{
-    style="font-size: 0.8em"
+    font-size: 0.8em;
+    opacity:0.6;
+    
+}
+table#permissions_manage td.private_repo_msg{
+    font-size: 0.8em;
+    
 }
 table#permissions_manage tr#add_perm_input td{
     vertical-align:middle;
diff --git a/pylons_app/templates/admin/repos/repo_edit.html b/pylons_app/templates/admin/repos/repo_edit.html
--- a/pylons_app/templates/admin/repos/repo_edit.html
+++ b/pylons_app/templates/admin/repos/repo_edit.html
@@ -84,12 +84,12 @@
                         %for r2p in c.repo_info.repo2perm:
                             %if r2p.user.username =='default' and c.repo_info.private:
                                 <tr>
-                                    <td colspan="6">
+                                    <td colspan="4">
                                         <span class="private_repo_msg">
-                                        ${_('disabled for private repository')}
+                                        ${_('private repository')}
                                         </span>
                                     </td>
-                                    <td>${r2p.user.username}</td>
+                                    <td class="private_repo_msg">${r2p.user.username}</td>
                                 </tr>
                             %else:
                             <tr id="id${id(r2p.user.username)}">
@@ -106,7 +106,8 @@
                                                 var sUrl = "${h.url('delete_repo_user',repo_name=c.repo_name)}";
                                                 var callback = { success:function(o){
                                                 var tr = YAHOO.util.Dom.get(String(field_id));
-                                                tr.parentNode.removeChild(tr);}};
+                                                tr.parentNode.removeChild(tr);},failure:function(o){
+                                                    alert("${_('Failed to remove user')}");},};
                                                 var postData = '_method=delete&user_id='+user_id; 
                                                 var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);};
                                         </script>           
@@ -117,7 +118,7 @@
                             %endif
                         %endfor
 
-                        <tr id="add_perm_input" >
+                        <tr id="add_perm_input">
                             <td>${h.radio('perm_new_user','repository.none')}</td>
                             <td>${h.radio('perm_new_user','repository.read')}</td>
                             <td>${h.radio('perm_new_user','repository.write')}</td>
diff --git a/pylons_app/templates/admin/repos/repos.html b/pylons_app/templates/admin/repos/repos.html
--- a/pylons_app/templates/admin/repos/repos.html
+++ b/pylons_app/templates/admin/repos/repos.html
@@ -28,6 +28,7 @@
         <table class="table_disp">
         <tr class="header">
             <th class="left">${_('name')}</th>
+            <th class="left">${_('owner')}</th>
             <th class="left">${_('last revision')}</th>
             <th class="left">${_('action')}</th>
         </tr>
@@ -40,6 +41,7 @@
                     <img alt="${_('public')}" src="/images/icons/lock_open.png"/>
                  %endif         
                 ${h.link_to(repo['name'],h.url('edit_repo',repo_name=repo['name']))}</td>
+                <td>${repo['contact']}</td>
                 <td>r${repo['rev']}:${repo['tip']}</td>
                 <td>
                   ${h.form(url('repo', repo_name=repo['name']),method='delete')}
diff --git a/pylons_app/templates/settings/repo_settings.html b/pylons_app/templates/settings/repo_settings.html
--- a/pylons_app/templates/settings/repo_settings.html
+++ b/pylons_app/templates/settings/repo_settings.html
@@ -26,16 +26,16 @@
         <div class="fields">
             <div class="field">
                 <div class="label">
-                    <label for="input-medium">${_('Name')}:</label>
+                    <label for="repo_name">${_('Name')}:</label>
                 </div>
-                <div class="input">
+                <div class="input input-medium">
                     ${h.text('repo_name')}
                 </div>
              </div>
              
             <div class="field">
                 <div class="label label-textarea">
-                    <label for="input-small">${_('Description')}:</label>
+                    <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
@@ -44,7 +44,7 @@
             
             <div class="field">
                 <div class="label label-checkbox">
-                    <label for="input-small">${_('Private')}:</label>
+                    <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
@@ -53,7 +53,7 @@
              
              <div class="field">
                 <div class="label">
-                    <label for="input-small">${_('Permissions')}:</label>
+                    <label for="">${_('Permissions')}:</label>
                 </div>
                 <div class="input">
                     <table id="permissions_manage">
@@ -69,12 +69,12 @@
                         %for r2p in c.repo_info.repo2perm:
                             %if r2p.user.username =='default' and c.repo_info.private:
                                 <tr>
-                                    <td colspan="6">
+                                    <td colspan="4">
                                         <span class="private_repo_msg">
-                                        ${_('disabled for private repository')}
+                                        ${_('private repository')}
                                         </span>
                                     </td>
-                                    <td>${r2p.user.username}</td>
+                                    <td class="private_repo_msg">${r2p.user.username}</td>
                                 </tr>
                             %else:
                             <tr id="id${id(r2p.user.username)}">
@@ -91,7 +91,8 @@
                                                 var sUrl = "${h.url('delete_repo_user',repo_name=c.repo_name)}";
                                                 var callback = { success:function(o){
                                                 var tr = YAHOO.util.Dom.get(String(field_id));
-                                                tr.parentNode.removeChild(tr);}};
+                                                tr.parentNode.removeChild(tr);},failure:function(o){
+                                                	alert("${_('Failed to remove user')}");},};
                                                 var postData = '_method=delete&user_id='+user_id; 
                                                 var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);};
                                         </script>           
@@ -135,6 +136,9 @@
         <script type="text/javascript">
             YAHOO.util.Event.onDOMReady(function(){
                 var D = YAHOO.util.Dom;
+                if(!D.hasClass('perm_new_user_name','error')){
+                    D.setStyle('add_perm_input','display','none');
+                }
                 YAHOO.util.Event.addListener('add_perm','click',function(){
                     D.setStyle('add_perm_input','display','');
                     D.setStyle('add_perm','opacity','0.6');