kallithea Changeset - 17721a2dfadb

Changeset - 17721a2dfadb

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-02-25 01:36:17
marcin@python-works.com

fixed breadcrumbs in few pages

3 files changed with 5 insertions and 1 deletions:

rhodecode/templates/admin/repos/repo_edit.html

rhodecode/templates/settings/repo_fork.html

rhodecode/templates/settings/repo_settings.html

0 comments (0 inline, 0 general)

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Edit repository')} ${c.repo_info.repo_name} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repositories'),h.url('repos'))}
     &raquo;
-    ${_('edit')} "${c.repo_name}"
+    ${_('edit')} &raquo; ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label">
                     <label for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('repo_name',class_="medium")}
                 </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="repo_type">${_('Type')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('repo_type','hg',c.backends,class_="medium")}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <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="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="enable_statistics">${_('Enable statistics')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('enable_statistics',value="True")}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="enable_downloads">${_('Enable downloads')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('enable_downloads',value="True")}
                 </div>
             </div>
             <div class="field">
                 <div class="label">
                     <label for="user">${_('Owner')}:</label>
                 </div>
                 <div class="input input-small ac">
                     <div class="perm_ac">
                        ${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">
                     <%include file="repo_edit_perms.html"/>
                 </div>
             <div class="buttons">
               ${h.submit('save','Save',class_="ui-button")}
               ${h.reset('reset','Reset',class_="ui-button")}
             </div>
         </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_member_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 myUsers = ${c.users_array|n};
         	var myGroups = ${c.users_groups_array|n};
             // Define a custom search function for the DataSource of users
             var matchUsers = function(sQuery) {
                 // Case insensitive matching
                 var query = sQuery.toLowerCase();
                 var i=0;
                 var l=myUsers.length;
                 var matches = [];
                 // Match against each name of each contact
                 for(; i<l; i++) {
                     contact = myUsers[i];
                     if((contact.fname.toLowerCase().indexOf(query) > -1) ||
                         (contact.lname.toLowerCase().indexOf(query) > -1) ||
                         (contact.nname && (contact.nname.toLowerCase().indexOf(query) > -1))) {
                         matches[matches.length] = contact;
+                    }
+                }
                 return matches;
             };
             // Define a custom search function for the DataSource of usersGroups
             var matchGroups = function(sQuery) {
                 // Case insensitive matching
                 var query = sQuery.toLowerCase();
                 var i=0;
                 var l=myGroups.length;
                 var matches = [];
                 // Match against each name of each contact
                 for(; i<l; i++) {
                     matched_group = myGroups[i];
                     if(matched_group.grname.toLowerCase().indexOf(query) > -1) {
                         matches[matches.length] = matched_group;
+                    }
+                }
                 return matches;
             };
             //match all
             var matchAll = function(sQuery){
             	u = matchUsers(sQuery);
             	g = matchGroups(sQuery);
             	return u.concat(g);
             };
             // DataScheme for members
             var memberDS = new YAHOO.util.FunctionDataSource(matchAll);
             memberDS.responseSchema = {
                 fields: ["id", "fname", "lname", "nname", "grname", "grmembers"]
             };
             // DataScheme for owner
             var ownerDS = new YAHOO.util.FunctionDataSource(matchUsers);
             ownerDS.responseSchema = {
                 fields: ["id", "fname", "lname", "nname"]
             };
             // Instantiate AutoComplete for perms
             var membersAC = new YAHOO.widget.AutoComplete("perm_new_member_name", "perm_container", memberDS);
             membersAC.useShadow = false;
             membersAC.resultTypeList = false;
             // Instantiate AutoComplete for owner
             var ownerAC = new YAHOO.widget.AutoComplete("user", "owner_container", ownerDS);
             ownerAC.useShadow = false;
             ownerAC.resultTypeList = false;
             // Helper highlight function for the formatter
             var highlightMatch = function(full, snippet, matchindex) {
                 return full.substring(0, matchindex) +
                         "<span class='match'>" +
                         full.substr(matchindex, snippet.length) +
                         "</span>" +
                         full.substring(matchindex + snippet.length);
             };
             // Custom formatter to highlight the matching letters
             var custom_formatter = function(oResultData, sQuery, sResultMatch) {
             	var query = sQuery.toLowerCase();

rhodecode/templates/settings/repo_fork.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Fork')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))}
     &raquo;
     ${_('fork')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
 	            <div class="label">
 	                <label for="repo_name">${_('Fork name')}:</label>
 	            </div>
 	            <div class="input">
 	                ${h.text('fork_name',class_="small")}
 	                ${h.hidden('repo_type',c.repo_info.repo_type)}
 	            </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <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="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
              </div>
 	        <div class="buttons">
 	          ${h.submit('','fork this repository',class_="ui-button")}
 	        </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 </%def>

rhodecode/templates/settings/repo_settings.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Settings')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${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="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input input-medium">
                     ${h.text('repo_name',class_="small")}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <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="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
             </div>
              <div class="field">
                 <div class="label">
                     <label for="">${_('Permissions')}:</label>
                 </div>
                 <div class="input">
                     <%include file="../admin/repos/repo_edit_perms.html"/>
                 </div>
             <div class="buttons">
               ${h.submit('update','Update',class_="ui-button")}
               ${h.reset('reset','Reset',class_="ui-button")}
             </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) ||
                         (contact.lname.toLowerCase().indexOf(query) > -1) ||
                         (contact.nname && (contact.nname.toLowerCase().indexOf(query) > -1))) {
                         matches[matches.length] = contact;
+                    }
+                }
                 return matches;
             };
             // Use a FunctionDataSource
             var oDS = new YAHOO.util.FunctionDataSource(matchNames);
             oDS.responseSchema = {
                 fields: ["id", "fname", "lname", "nname"]
+            }
             // Instantiate AutoComplete for perms
             var oAC_perms = new YAHOO.widget.AutoComplete("perm_new_user_name", "perm_container", oDS);
             oAC_perms.useShadow = false;
             oAC_perms.resultTypeList = false;
             // Instantiate AutoComplete for owner
             var oAC_owner = new YAHOO.widget.AutoComplete("user", "owner_container", oDS);
             oAC_owner.useShadow = false;
             oAC_owner.resultTypeList = false;
             // Custom formatter to highlight the matching letters
             var custom_formatter = function(oResultData, sQuery, sResultMatch) {
                 var query = sQuery.toLowerCase(),
                     fname = oResultData.fname,
                     lname = oResultData.lname,
                     nname = oResultData.nname || "", // Guard against null value
                     query = sQuery.toLowerCase(),
                     fnameMatchIndex = fname.toLowerCase().indexOf(query),
                     lnameMatchIndex = lname.toLowerCase().indexOf(query),
                     nnameMatchIndex = nname.toLowerCase().indexOf(query),
                     displayfname, displaylname, displaynname;
                 if(fnameMatchIndex > -1) {
                     displayfname = highlightMatch(fname, query, fnameMatchIndex);
+                }
                 else {
                     displayfname = fname;
+                }
                 if(lnameMatchIndex > -1) {
                     displaylname = highlightMatch(lname, query, lnameMatchIndex);
+                }
                 else {
                     displaylname = lname;
+                }
                 if(nnameMatchIndex > -1) {
                     displaynname = "(" + highlightMatch(nname, query, nnameMatchIndex) + ")";
+                }
                 else {
                     displaynname = nname ? "(" + nname + ")" : "";
+                }
                 return displayfname + " " + displaylname + " " + displaynname;
             };
             oAC_perms.formatResult = custom_formatter;
             oAC_owner.formatResult = custom_formatter;
             // Helper function for the formatter
             var highlightMatch = function(full, snippet, matchindex) {
                 return full.substring(0, matchindex) +
                         "<span class='match'>" +
                         full.substr(matchindex, snippet.length) +
                         "</span>" +
                         full.substring(matchindex + snippet.length);
             };
             var myHandler = function(sType, aArgs) {
                 var myAC = aArgs[0]; // reference back to the AC instance
                 var elLI = aArgs[1]; // reference to the selected LI element
                 var oData = aArgs[2]; // object literal of selected item's result data
                 myAC.getInputEl().value = oData.nname;
             };
             oAC_perms.itemSelectEvent.subscribe(myHandler);
             //oAC_owner.itemSelectEvent.subscribe(myHandler);
             return {
                 oDS: oDS,
                 oAC_perms: oAC_perms,
                 oAC_owner: oAC_owner,
             };
         }();
         </script>
 </div>
 </div>
 </%def>

0 comments (0 inline, 0 general)