Changeset - 0f35fa0f4eb8
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
Marcin Kuzminski - 15 years ago 2010-07-27 14:48:13
marcin@python-works.com
fixed some html and styles, added owner into admin repo list
added alert message when using ajax remove user command in permissions
4 files changed with 30 insertions and 17 deletions:
pylons_app/public/css/style.css
9
3
pylons_app/templates/admin/repos/repo_edit.html
6
5
pylons_app/templates/admin/repos/repos.html
2
pylons_app/templates/settings/repo_settings.html
13
9
0 comments (0 inline, 0 general)
pylons_app/public/css/style.css
➞
Show inline comments
 
@@ -2595,80 +2595,80 @@ div.options a:hover
 
    overflow: hidden;
 
}
 
 
#register div.form div.fields div.field
 
{
 
	margin: 0;
 
	padding: 0 0 10px 0;
 
	clear: both;
 
	overflow: hidden;
 
}
 
 
#register div.form div.fields div.field span.error-message
 
{
 
	margin: 8px 0 0 0;
 
	padding: 0;
 
	height: 1%;
 
	display: block;
 
	color: #FF0000;
 
}
 
 
#register div.form div.fields div.field div.label
 
{
 
	margin: 2px 10px 0 0;
 
	padding: 5px 0 0 5px;
 
	width: 82px;
 
	width: 100px;
 
	float: left;
 
    text-align: right;
 
}
 
 
#register div.form div.fields div.field div.label label
 
{
 
    color: #000000;
 
    font-weight: bold;
 
}
 
 
#register  div.form div.fields div.field div.label span
 
{
 
	margin: 0;
 
	padding: 2px 0 0 0;
 
	height: 1%;
 
	display: block;
 
	color: #363636;
 
}
 
 
#register div.form div.fields div.field div.input
 
{
 
	margin: 0;
 
	padding: 0;
 
	float: left;
 
}
 
 
#register div.form div.fields div.field div.input input
 
{
 
    margin: 0;
 
    padding: 7px 7px 6px 7px;
 
    width: 266px;
 
    width: 245px;
 
    background: #FFFFFF;
 
    border-top: 1px solid #b3b3b3;
 
    border-left: 1px solid #b3b3b3;
 
    border-right: 1px solid #eaeaea;
 
    border-bottom: 1px solid #eaeaea;
 
    color: #000000;
 
	font-family: Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 
	font-size: 11px;
 
}
 
 
#register div.form div.fields div.field div.input  input.error
 
{
 
	background: #FBE3E4;
 
	border-top: 1px solid #e1b2b3;
 
	border-left: 1px solid #e1b2b3;
 
	border-right: 1px solid #FBC2C4;
 
	border-bottom: 1px solid #FBC2C4;
 
}
 
 
#register div.form div.fields div.field div.input  input.success
 
{
 
	background: #E6EFC2;
 
	border-top: 1px solid #cebb98;
 
	border-left: 1px solid #cebb98;
 
@@ -3295,49 +3295,55 @@ div#legend_container table,div#legend_ch
 
}
 
 
div#legend_container table td{
 
	border: none !important;
 
	padding: 2px !important;
 
}
 
 
div#legend_choices table td{
 
	border: none !important;
 
	padding: 0px !important;
 
}
 
 
div#legend_choices{
 
	float:left;
 
}
 
 
/* -----------------------------------------------------------
 
    PERMISSIONS TABLE
 
----------------------------------------------------------- */
 
table#permissions_manage{
 
    width: 0 !important;
 
 
}
 
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;
 
 
}
 
 
 
/* -----------------------------------------------------------
 
	jquery ui
 
----------------------------------------------------------- */
 
 
.ui-helper-hidden { display: none; }
 
.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
 
.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
 
 
/* -----------------------------------------------------------
 
	jquery ui -> icons
 
----------------------------------------------------------- */
 
 
.ui-icon { width: 16px; height: 16px; background-image: url(../images/ui/ui-icons_222222_256x240.png); }
 
.ui-widget-content .ui-icon {background-image: url(../images/ui/ui-icons_222222_256x240.png); }
 
.ui-widget-header .ui-icon {background-image: url(../images/ui/ui-icons_222222_256x240.png); }
 
.ui-state-default .ui-icon { background-image: url(../images/ui/ui-icons_ef8c08_256x240.png); }
 
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon { background-image: url(../images/ui/ui-icons_ef8c08_256x240.png); }
pylons_app/templates/admin/repos/repo_edit.html
➞
Show inline comments
 
@@ -63,82 +63,83 @@
 
                       ${h.text('user',class_='yui-ac-input')}
 
                       <div id="owner_container"></div>
 
                    </div>
 
                </div>
 
             </div>
 
 
            <div class="field">
 
                <div class="label">
 
                    <label for="input">${_('Permissions')}:</label>
 
                </div>
 
                <div class="input">
 
                    <table id="permissions_manage">
 
                        <tr>
 
                            <td>${_('none')}</td>
 
                            <td>${_('read')}</td>
 
                            <td>${_('write')}</td>
 
                            <td>${_('admin')}</td>
 
                            <td>${_('user')}</td>
 
                            <td></td>
 
                        </tr>
 
 
                        %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)}">
 
                                <td>${h.radio('perm_%s' % r2p.user.username,'repository.none')}</td>
 
                                <td>${h.radio('perm_%s' % r2p.user.username,'repository.read')}</td>
 
                                <td>${h.radio('perm_%s' % r2p.user.username,'repository.write')}</td>
 
                                <td>${h.radio('perm_%s' % r2p.user.username,'repository.admin')}</td>
 
                                <td>${r2p.user.username}</td>
 
                                <td>
 
                                  %if r2p.user.username !='default':
 
                                    <span class="delete_icon action_button" onclick="ajaxAction(${r2p.user.user_id},'${'id%s'%id(r2p.user.username)}')">
 
                                        <script type="text/javascript">
 
                                            function ajaxAction(user_id,field_id){
 
                                                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>
 
                                    </span>
 
                                  %endif
 
                                </td>
 
                            </tr>
 
                            %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>

			




	
	
	
		
 
                            <td>${h.radio('perm_new_user','repository.admin')}</td>

			




	
	
	
		
 
                            <td class='ac'>

			




	
	
	
		
 
                                <div class="perm_ac" id="perm_ac">

			




	
	
	
		
 
                                    ${h.text('perm_new_user_name',class_='yui-ac-input')}

			




	
	
	
		
 
                                    <div id="perm_container"></div>

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                            </td>

			




	
	
	
		
 
                            <td></td>

			




	
	
	
		
 
                        </tr>

			




	
	
	
		
 
                        <tr>

			




	
	
	
		
 
                            <td colspan="6">

			




	
	
	
		
 
                                <span id="add_perm" class="add_icon" style="cursor: pointer;">

			




	
	
	
		
 
                                ${_('Add another user')}

			




	
	
	
		
 
                                </span>

			




	
	
	
		
 
                            </td>

			




	
	
	
		
 
                        </tr>

			




	
	
	
		
 
                    </table>             

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
             

			




	
	
	
		
 
            <div class="buttons">

			




	
	
	
		
 
              ${h.submit('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")}

			




        

    


    
    

    

        

                

                    pylons_app/templates/admin/repos/repos.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -7,49 +7,51 @@

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; ${_('Repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
	${self.menu('admin')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
          <li>

			




	
	
	
		
 
            <span>${h.link_to(u'ADD NEW REPO',h.url('new_repo'),class_="add_icon")}</span>

			




	
	
	
		
 
          </li>          

			




	
	
	
		
 
        </ul>        

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <!-- end box / title -->

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <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>

			




	
	
	
		
 
            %for cnt,repo in enumerate(c.repos_list):

			




	
	
	
		
 
            <tr class="parity${cnt%2}">

			




	
	
	
		
 
                 <td>

			




	
	
	
		
 
                 %if repo['repo'].dbrepo.private:

			




	
	
	
		
 
                    <img alt="${_('private')}" src="/images/icons/lock.png"/>

			




	
	
	
		
 
                 %else:

			




	
	
	
		
 
                    <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')}

			




	
	
	
		
 
                    ${h.submit('remove','delete',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}

			




	
	
	
		
 
                  ${h.end_form()}

			




	
	
	
		
 
                </td>

			




	
	
	
		
 
            </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
        </table>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div> 

			




	
	
	
		
 
		   

			




	
	
	
		
 
</%def>    

			




        

    


    
    

    

        

                

                    pylons_app/templates/settings/repo_settings.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -5,157 +5,161 @@

			




	
	
	
		
 
    ${_('Repositories administration')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))} 

			




	
	
	
		
 
    &raquo; 

			




	
	
	
		
 
    ${_('Settings')} 

			




	
	
	
		
 
    

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('settings')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}      

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ${h.form(url('repo_settings_update', repo_name=c.repo_info.repo_name),method='put')}

			




	
	
	
		
 
    <div class="form">

			




	
	
	
		
 
        <!-- fields -->

			




	
	
	
		
 
        <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)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            

			




	
	
	
		
 
            <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")}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
             

			




	
	
	
		
 
             <div class="field">

			




	
	
	
		
 
                <div class="label">

			




	
	
	
		
 
                    <label for="input-small">${_('Permissions')}:</label>

			




	
	
	
		
 
                    <label for="">${_('Permissions')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    <table id="permissions_manage">

			




	
	
	
		
 
                        <tr>

			




	
	
	
		
 
                            <td>${_('none')}</td>

			




	
	
	
		
 
                            <td>${_('read')}</td>

			




	
	
	
		
 
                            <td>${_('write')}</td>

			




	
	
	
		
 
                            <td>${_('admin')}</td>

			




	
	
	
		
 
                            <td>${_('user')}</td>

			




	
	
	
		
 
                            <td></td>

			




	
	
	
		
 
                        </tr>

			




	
	
	
		
 
                        

			




	
	
	
		
 
                        %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)}">

			




	
	
	
		
 
                                <td>${h.radio('perm_%s' % r2p.user.username,'repository.none')}</td>

			




	
	
	
		
 
                                <td>${h.radio('perm_%s' % r2p.user.username,'repository.read')}</td>

			




	
	
	
		
 
                                <td>${h.radio('perm_%s' % r2p.user.username,'repository.write')}</td>

			




	
	
	
		
 
                                <td>${h.radio('perm_%s' % r2p.user.username,'repository.admin')}</td>

			




	
	
	
		
 
                                <td>${r2p.user.username}</td>

			




	
	
	
		
 
                                <td>

			




	
	
	
		
 
                                  %if r2p.user.username !='default':

			




	
	
	
		
 
                                    <span class="delete_icon action_button" onclick="ajaxAction(${r2p.user.user_id},'${'id%s'%id(r2p.user.username)}')">

			




	
	
	
		
 
                                        <script type="text/javascript">

			




	
	
	
		
 
                                            function ajaxAction(user_id,field_id){

			




	
	
	
		
 
                                                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>           

			




	
	
	
		
 
                                    </span>

			




	
	
	
		
 
                                  %endif                    

			




	
	
	
		
 
                                </td>

			




	
	
	
		
 
                            </tr>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        %endfor

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
                        <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>

			




	
	
	
		
 
                            <td>${h.radio('perm_new_user','repository.admin')}</td>

			




	
	
	
		
 
                            <td class='ac'>

			




	
	
	
		
 
                                <div class="perm_ac" id="perm_ac">

			




	
	
	
		
 
                                    ${h.text('perm_new_user_name',class_='yui-ac-input')}

			




	
	
	
		
 
                                    <div id="perm_container"></div>

			




	
	
	
		
 
                                </div>

			




	
	
	
		
 
                            </td>

			




	
	
	
		
 
                            <td></td>

			




	
	
	
		
 
                        </tr>

			




	
	
	
		
 
                        <tr>

			




	
	
	
		
 
                            <td colspan="6">

			




	
	
	
		
 
                                <span id="add_perm" class="add_icon" style="cursor: pointer;">

			




	
	
	
		
 
                                ${_('Add another user')}

			




	
	
	
		
 
                                </span>

			




	
	
	
		
 
                            </td>

			




	
	
	
		
 
                        </tr>

			




	
	
	
		
 
                    </table>             

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
             

			




	
	
	
		
 
            <div class="buttons">

			




	
	
	
		
 
              ${h.submit('update','update',class_="ui-button ui-widget ui-state-default ui-corner-all")}

			




	
	
	
		
 
            </div>                                                          

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>    

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 
        <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');

			




	
	
	
		
 
                    D.setStyle('add_perm','cursor','default');

			




	
	
	
		
 
                });

			




	
	
	
		
 
            });

			




	
	
	
		
 
        </script>

			




	
	
	
		
 
        <script type="text/javascript">    

			




	
	
	
		
 
        YAHOO.example.FnMultipleFields = function(){

			




	
	
	
		
 
            var myContacts = ${c.users_array|n}

			




	
	
	
		
 
            

			




	
	
	
		
 
            // Define a custom search function for the DataSource

			




	
	
	
		
 
            var matchNames = function(sQuery) {

			




	
	
	
		
 
                // Case insensitive matching

			




	
	
	
		
 
                var query = sQuery.toLowerCase(),

			




	
	
	
		
 
                    contact,

			




	
	
	
		
 
                    i=0,

			




	
	
	
		
 
                    l=myContacts.length,

			




	
	
	
		
 
                    matches = [];

			




	
	
	
		
 
                

			




	
	
	
		
 
                // Match against each name of each contact

			




	
	
	
		
 
                for(; i<l; i++) {

			




	
	
	
		
 
                    contact = myContacts[i];

			




	
	
	
		
 
                    if((contact.fname.toLowerCase().indexOf(query) > -1) ||

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.