kallithea Changeset - e29c688e6885

Changeset - e29c688e6885

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 14 years ago 2012-03-13 05:52:15
marcin@python-works.com

linkify perms and make global ones display better

2 files changed with 13 insertions and 4 deletions:

rhodecode/public/js/rhodecode.js

rhodecode/templates/admin/users/user_edit_my_account.html

0 comments (0 inline, 0 general)

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -611,128 +611,129 @@ var deleteNotification = function(url, n @@
 /**
  * QUICK REPO MENU
  */
 var quick_repo_menu = function(){
     YUE.on(YUQ('.quick_repo_menu'),'mouseenter',function(e){
             var menu = e.currentTarget.firstElementChild.firstElementChild;
             if(YUD.hasClass(menu,'hidden')){
                 YUD.replaceClass(e.currentTarget,'hidden', 'active');
                 YUD.replaceClass(menu, 'hidden', 'active');
+            }
         })
     YUE.on(YUQ('.quick_repo_menu'),'mouseleave',function(e){
             var menu = e.currentTarget.firstElementChild.firstElementChild;
             if(YUD.hasClass(menu,'active')){
                 YUD.replaceClass(e.currentTarget, 'active', 'hidden');
                 YUD.replaceClass(menu, 'active', 'hidden');
+            }
         })
 };
 /**
  * TABLE SORTING
  */
 // returns a node from given html;
 var fromHTML = function(html){
 	  var _html = document.createElement('element');
 	  _html.innerHTML = html;
 	  return _html;
+}
 var get_rev = function(node){
     var n = node.firstElementChild.firstElementChild;
     if (n===null){
         return -1
+    }
     else{
         out = n.firstElementChild.innerHTML.split(':')[0].replace('r','');
         return parseInt(out);
+    }
+}
 var get_name = function(node){
 	 var name = node.firstElementChild.children[2].innerHTML;
 	 return name
+}
 var get_group_name = function(node){
 	var name = node.firstElementChild.children[1].innerHTML;
 	return name
+}
 var get_date = function(node){
 	var date_ = node.firstElementChild.innerHTML;
 	return date_
+}
 var revisionSort = function(a, b, desc, field) {
 	  var a_ = fromHTML(a.getData(field));
 	  var b_ = fromHTML(b.getData(field));
 	  // extract revisions from string nodes
 	  a_ = get_rev(a_)
 	  b_ = get_rev(b_)
 	  var comp = YAHOO.util.Sort.compare;
 	  var compState = comp(a_, b_, desc);
 	  return compState;
 };
 var ageSort = function(a, b, desc, field) {
     var a_ = a.getData(field);
     var b_ = b.getData(field);
     var comp = YAHOO.util.Sort.compare;
     var compState = comp(a_, b_, desc);
     return compState;
 };
 var nameSort = function(a, b, desc, field) {
     var a_ = fromHTML(a.getData(field));
     var b_ = fromHTML(b.getData(field));
     // extract name from table
     a_ = get_name(a_)
     b_ = get_name(b_)
     var comp = YAHOO.util.Sort.compare;
     var compState = comp(a_, b_, desc);
     return compState;
 };
 var permNameSort = function(a, b, desc, field) {
     var a_ = fromHTML(a.getData(field));
     var b_ = fromHTML(b.getData(field));
     // extract name from table
     a_ = a_.innerHTML;
     b_ = b_.innerHTML;
     a_ = a_.children[0].innerHTML;
     b_ = b_.children[0].innerHTML;
     var comp = YAHOO.util.Sort.compare;
     var compState = comp(a_, b_, desc);
     return compState;
 };
 var groupNameSort = function(a, b, desc, field) {
     var a_ = fromHTML(a.getData(field));
     var b_ = fromHTML(b.getData(field));
     // extract name from table
     a_ = get_group_name(a_)
     b_ = get_group_name(b_)
     var comp = YAHOO.util.Sort.compare;
     var compState = comp(a_, b_, desc);
     return compState;
 };
 var dateSort = function(a, b, desc, field) {
     var a_ = fromHTML(a.getData(field));
     var b_ = fromHTML(b.getData(field));
     // extract name from table
     a_ = get_date(a_)
     b_ = get_date(b_)
     var comp = YAHOO.util.Sort.compare;
     var compState = comp(a_, b_, desc);
     return compState;
 };
@@ \ No newline at end of file @@

rhodecode/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

@@ @@ -93,196 +93,204 @@ @@
 	                <div class="label">
 	                    <label for="email">${_('Email')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('email',class_="medium")}
 	                </div>
 	             </div>
 	            <div class="buttons">
 	              ${h.submit('save',_('Save'),class_="ui-button")}
 	              ${h.reset('reset',_('Reset'),class_="ui-button")}
 	            </div>
 	    	</div>
 	    </div>
     ${h.end_form()}
     </div>
 </div>
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
         <h5>
         <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
         <a id="show_my" class="link-white" href="#my">${_('My repos')}</a> / <a id="show_perms" class="link-white" href="#perms">${_('My permissions')}</a>
         </h5>
          %if h.HasPermissionAny('hg.admin','hg.create.repository')():
          <ul class="links">
            <li>
              <span>${h.link_to(_('ADD'),h.url('admin_settings_create_repository'))}</span>
            </li>
          </ul>
          %endif
     </div>
     <!-- end box / title -->
     <div id="my" class="table">
         <div id='repos_list_wrap' class="yui-skin-sam">
         <table id="repos_list">
 	    <thead>
             <tr>
             <th></th>
             <th class="left">${_('Name')}</th>
             <th class="left">${_('Revision')}</th>
             <th class="left">${_('Action')}</th>
             <th class="left">${_('Action')}</th>
 	    </thead>
 	     <tbody>
          <%namespace name="dt" file="/_data_table/_dt_elements.html"/>
 	     %if c.user_repos:
 		     %for repo in c.user_repos:
 		        <tr>
                     ##QUICK MENU
                     <td class="quick_repo_menu">
                       ${dt.quick_menu(repo['name'])}
                     </td>
                     ##REPO NAME AND ICONS
                     <td class="reponame">
                       ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'))}
                     </td>
                     ##LAST REVISION
                     <td>
                         ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}
                     </td>
 		            <td><a href="${h.url('repo_settings_home',repo_name=repo['name'])}" title="${_('edit')}"><img class="icon" alt="${_('private')}" src="${h.url('/images/icons/application_form_edit.png')}"/></a></td>
 		            <td>
 	                  ${h.form(url('repo_settings_delete', repo_name=repo['name']),method='delete')}
 	                    ${h.submit('remove_%s' % repo['name'],'',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo['name']+"');")}
 	                  ${h.end_form()}
 		            </td>
 		        </tr>
 		     %endfor
 	     %else:
             <div style="padding:5px 0px 10px 0px;">
 	     	${_('No repositories yet')}
 	     	%if h.HasPermissionAny('hg.admin','hg.create.repository')():
 	     		${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-btn")}
 	     	%endif
             </div>
 	     %endif
 	     </tbody>
 	     </table>
        </div>
     </div>
     <div id="perms" class="table" style="display:none">
            %for section in sorted(c.rhodecode_user.permissions.keys()):
             <div class="perms_section_head">${section.replace("_"," ").capitalize()}</div>
             <div id='tbl_list_wrap_${section}' class="yui-skin-sam">
             <table id="tbl_list_${section}">
               <thead>
                   <tr>
                   <th class="left">${_('Name')}</th>
                   <th class="left">${_('Permission')}</th>
               </thead>
               <tbody>
             %for k in c.rhodecode_user.permissions[section]:
                 <tr>
                     <td>${k}</td>
                     <td>
                         %if section == 'repositories':
                             <a href="${h.url('summary_home',repo_name=k)}">${k}</a>
                         %elif section == 'repositories_groups':
                             <a href="${h.url('repos_group_home',group_name=k)}">${k}</a>
                         %else:
                             ${k}
                         %endif
                     </td>
                     <td>
                         %if section == 'global':
-                         ${', '.join(c.rhodecode_user.permissions[section])}
+                         ${h.bool2icon(True)}
                         %else:
                         <span class="perm_tag ${c.rhodecode_user.permissions[section].get(k).split('.')[-1] }">${c.rhodecode_user.permissions[section].get(k)}</span>
                         %endif
                      </td>
                 </tr>
             %endfor
             </tbody>
             </table>
             </div>
            %endfor
     </div>
 </div>
 <script type="text/javascript">
 var filter_activate = function(){
     var nodes = YUQ('#my tr td a.repo_name');
     var func = function(node){
         return node.parentNode.parentNode.parentNode.parentNode;
+    }
     q_filter('q_filter',YUQ('#my tr td a.repo_name'),func);
+}
 YUE.on('show_my','click',function(e){
     YUD.setStyle('perms','display','none');
     YUD.setStyle('my','display','');
     YUD.get('q_filter').removeAttribute('disabled');
     filter_activate();
     YUE.preventDefault(e);
 })
 YUE.on('show_perms','click',function(e){
     YUD.setStyle('my','display','none');
     YUD.setStyle('perms','display','');
     YUD.setAttribute('q_filter','disabled','disabled');
     YUE.preventDefault(e);
 })
 // main table sorting
 var myColumnDefs = [
     {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
     {key:"name",label:"${_('Name')}",sortable:true,
         sortOptions: { sortFunction: nameSort }},
     {key:"tip",label:"${_('Tip')}",sortable:true,
         sortOptions: { sortFunction: revisionSort }},
     {key:"action1",label:"",sortable:false},
     {key:"action2",label:"",sortable:false},
 ];
 var myDataSource = new YAHOO.util.DataSource(YUD.get("repos_list"));
 myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
 myDataSource.responseSchema = {
     fields: [
         {key:"menu"},
         {key:"name"},
         {key:"tip"},
         {key:"action1"},
         {key:"action2"},
+    ]
 };
 var trans_defs =  {
     sortedBy:{key:"name",dir:"asc"},
     MSG_SORTASC:"${_('Click to sort ascending')}",
     MSG_SORTDESC:"${_('Click to sort descending')}",
     MSG_EMPTY:"${_('No records found.')}",
     MSG_ERROR:"${_('Data error.')}",
     MSG_LOADING:"${_('Loading...')}",
+}
 var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,trans_defs);
 myDataTable.subscribe('postRenderEvent',function(oArgs) {
     tooltip_activate();
     quick_repo_menu();
     filter_activate();
 });
 var permsColumnDefs = [
     {key:"name",label:"${_('Name')}",sortable:true, sortOptions: { sortFunction: permNameSort }},
     {key:"perm",label:"${_('Permission')}",sortable:false,},
 ];
 // perms repos table
 var myDataSource2 = new YAHOO.util.DataSource(YUD.get("tbl_list_repositories"));
 myDataSource2.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
 myDataSource2.responseSchema = {
     fields: [
         {key:"name"},
         {key:"perm"},
+    ]
 };
 new YAHOO.widget.DataTable("tbl_list_wrap_repositories", permsColumnDefs, myDataSource2, trans_defs);
 //perms groups table
 var myDataSource3 = new YAHOO.util.DataSource(YUD.get("tbl_list_repositories_groups"));
 myDataSource3.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
 myDataSource3.responseSchema = {
     fields: [
         {key:"name"},

0 comments (0 inline, 0 general)