fixes #65, Added reset buttons to edit forms

rhodecode/lib/helpers.py

@@ -1,447 +1,458 b''
 """Helper functions
 
 Consists of functions to typically be used within templates, but also
 available to Controllers. This module is available to both as 'h'.
 """
 from pygments.formatters import HtmlFormatter
 from pygments import highlight as code_highlight
 from pylons import url, app_globals as g
 from pylons.i18n.translation import _, ungettext
 from vcs.utils.annotate import annotate_highlight
 from webhelpers.html import literal, HTML, escape
 from webhelpers.html.tools import *
 from webhelpers.html.builder import make_tag
 from webhelpers.html.tags import auto_discovery_link, checkbox, css_classes, \
     end_form, file, form, hidden, image, javascript_link, link_to, link_to_if, \
     link_to_unless, ol, required_legend, select, stylesheet_link, submit, text, \
     password, textarea, title, ul, xml_declaration, radio
 from webhelpers.html.tools import auto_link, button_to, highlight, js_obfuscate, \
     mail_to, strip_links, strip_tags, tag_re
 from webhelpers.number import format_byte_size, format_bit_size
 from webhelpers.pylonslib import Flash as _Flash
 from webhelpers.pylonslib.secure_form import secure_form
 from webhelpers.text import chop_at, collapse, convert_accented_entities, \
     convert_misc_entities, lchop, plural, rchop, remove_formatting, \
     replace_whitespace, urlify, truncate, wrap_paragraphs
 from webhelpers.date import time_ago_in_words
 
+from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
+    convert_boolean_attrs, NotGiven
+
+def _reset(name, value=None, id=NotGiven, type="reset", **attrs):
+    _set_input_attrs(attrs, type, name, value)
+    _set_id_attr(attrs, id, name)
+    convert_boolean_attrs(attrs, ["disabled"])
+    return HTML.input(**attrs)
+
+reset = _reset
+
 #Custom helpers here :)
 class _Link(object):
     '''
     Make a url based on label and url with help of url_for
     :param label:name of link    if not defined url is used
     :param url: the url for link
     '''
 
     def __call__(self, label='', *url_, **urlargs):
         if label is None or '':
             label = url
         link_fn = link_to(label, url(*url_, **urlargs))
         return link_fn
 
 link = _Link()
 
 class _GetError(object):
 
     def __call__(self, field_name, form_errors):
         tmpl = """<span class="error_msg">%s</span>"""
         if form_errors and form_errors.has_key(field_name):
             return literal(tmpl % form_errors.get(field_name))
 
 get_error = _GetError()
 
 def recursive_replace(str, replace=' '):
     """
     Recursive replace of given sign to just one instance
     :param str: given string
     :param replace:char to find and replace multiple instances
         
     Examples::
     >>> recursive_replace("Mighty---Mighty-Bo--sstones",'-')
     'Mighty-Mighty-Bo-sstones'
     """
 
     if str.find(replace * 2) == -1:
         return str
     else:
         str = str.replace(replace * 2, replace)
         return recursive_replace(str, replace)
 
 class _ToolTip(object):
 
     def __call__(self, tooltip_title, trim_at=50):
         """
         Special function just to wrap our text into nice formatted autowrapped
         text
         :param tooltip_title:
         """
 
         return wrap_paragraphs(escape(tooltip_title), trim_at)\
                        .replace('\n', '<br/>')
 
     def activate(self):
         """
         Adds tooltip mechanism to the given Html all tooltips have to have 
         set class tooltip and set attribute tooltip_title.
         Then a tooltip will be generated based on that
         All with yui js tooltip
         """
 
         js = '''
         YAHOO.util.Event.onDOMReady(function(){
             function toolTipsId(){
                 var ids = [];
                 var tts = YAHOO.util.Dom.getElementsByClassName('tooltip');
                 
                 for (var i = 0; i < tts.length; i++) {
                     //if element doesn't not have and id autgenerate one for tooltip
                     
                     if (!tts[i].id){
                         tts[i].id='tt'+i*100;
                     }
                     ids.push(tts[i].id);
                 }
                 return ids        
             };
             var myToolTips = new YAHOO.widget.Tooltip("tooltip", { 
                 context: toolTipsId(),
                 monitorresize:false,
                 xyoffset :[0,0],
                 autodismissdelay:300000,
                 hidedelay:5,
                 showdelay:20,
             });
             
             //Mouse Over event disabled for new repositories since they don't
             //have last commit message
             myToolTips.contextMouseOverEvent.subscribe(
                 function(type, args) {
                     var context = args[0];
                     var txt = context.getAttribute('tooltip_title');
                     if(txt){                                       
                         return true;
                     }
                     else{
                         return false;
                     }
                 });
             
                             
             // Set the text for the tooltip just before we display it. Lazy method
             myToolTips.contextTriggerEvent.subscribe( 
                  function(type, args) { 
 
                  
                         var context = args[0]; 
                         
                         var txt = context.getAttribute('tooltip_title');
                         this.cfg.setProperty("text", txt);
                         
                         
                         // positioning of tooltip
                         var tt_w = this.element.clientWidth;
                         var tt_h = this.element.clientHeight;
                         
                         var context_w = context.offsetWidth;
                         var context_h = context.offsetHeight;
                         
                         var pos_x = YAHOO.util.Dom.getX(context);
                         var pos_y = YAHOO.util.Dom.getY(context);
 
                         var display_strategy = 'top';
                         var xy_pos = [0,0];
                         switch (display_strategy){
                         
                             case 'top':
                                 var cur_x = (pos_x+context_w/2)-(tt_w/2);
                                 var cur_y = pos_y-tt_h-4;
                                 xy_pos = [cur_x,cur_y];                                
                                 break;
                             case 'bottom':
                                 var cur_x = (pos_x+context_w/2)-(tt_w/2);
                                 var cur_y = pos_y+context_h+4;
                                 xy_pos = [cur_x,cur_y];                                
                                 break;
                             case 'left':
                                 var cur_x = (pos_x-tt_w-4);
                                 var cur_y = pos_y-((tt_h/2)-context_h/2);
                                 xy_pos = [cur_x,cur_y];                                
                                 break;
                             case 'right':
                                 var cur_x = (pos_x+context_w+4);
                                 var cur_y = pos_y-((tt_h/2)-context_h/2);
                                 xy_pos = [cur_x,cur_y];                                
                                 break;
                              default:
                                 var cur_x = (pos_x+context_w/2)-(tt_w/2);
                                 var cur_y = pos_y-tt_h-4;
                                 xy_pos = [cur_x,cur_y];                                
                                 break;                             
                                  
                         }
 
                         this.cfg.setProperty("xy",xy_pos);
 
                   });
                   
             //Mouse out 
             myToolTips.contextMouseOutEvent.subscribe(
                 function(type, args) {
                     var context = args[0];
                     
                 });
         });
         '''
         return literal(js)
 
 tooltip = _ToolTip()
 
 class _FilesBreadCrumbs(object):
 
     def __call__(self, repo_name, rev, paths):
         url_l = [link_to(repo_name, url('files_home',
                                         repo_name=repo_name,
                                         revision=rev, f_path=''))]
         paths_l = paths.split('/')
 
         for cnt, p in enumerate(paths_l, 1):
             if p != '':
                 url_l.append(link_to(p, url('files_home',
                                             repo_name=repo_name,
                                             revision=rev,
                                             f_path='/'.join(paths_l[:cnt]))))
 
         return literal('/'.join(url_l))
 
 files_breadcrumbs = _FilesBreadCrumbs()
 class CodeHtmlFormatter(HtmlFormatter):
 
     def wrap(self, source, outfile):
         return self._wrap_div(self._wrap_pre(self._wrap_code(source)))
 
     def _wrap_code(self, source):
         for cnt, it in enumerate(source, 1):
             i, t = it
             t = '<div id="#S-%s">%s</div>' % (cnt, t)
             yield i, t
 def pygmentize(filenode, **kwargs):
     """
     pygmentize function using pygments
     :param filenode:
     """
     return literal(code_highlight(filenode.content,
                                   filenode.lexer, CodeHtmlFormatter(**kwargs)))
 
 def pygmentize_annotation(filenode, **kwargs):
     """
     pygmentize function for annotation
     :param filenode:
     """
 
     color_dict = {}
     def gen_color():
         """generator for getting 10k of evenly distibuted colors using hsv color
         and golden ratio.
         """
         import colorsys
         n = 10000
         golden_ratio = 0.618033988749895
         h = 0.22717784590367374
         #generate 10k nice web friendly colors in the same order
         for c in xrange(n):
             h += golden_ratio
             h %= 1
             HSV_tuple = [h, 0.95, 0.95]
             RGB_tuple = colorsys.hsv_to_rgb(*HSV_tuple)
             yield map(lambda x:str(int(x * 256)), RGB_tuple)
 
     cgenerator = gen_color()
 
     def get_color_string(cs):
         if color_dict.has_key(cs):
             col = color_dict[cs]
         else:
             col = color_dict[cs] = cgenerator.next()
         return "color: rgb(%s)! important;" % (', '.join(col))
 
     def url_func(changeset):
         tooltip_html = "<div style='font-size:0.8em'><b>Author:</b>" + \
         " %s<br/><b>Date:</b> %s</b><br/><b>Message:</b> %s<br/></div>"
 
         tooltip_html = tooltip_html % (changeset.author,
                                                changeset.date,
                                                tooltip(changeset.message))
         lnk_format = '%5s:%s' % ('r%s' % changeset.revision,
                                  short_id(changeset.raw_id))
         uri = link_to(
                 lnk_format,
                 url('changeset_home', repo_name=changeset.repository.name,
                     revision=changeset.raw_id),
                 style=get_color_string(changeset.raw_id),
                 class_='tooltip',
                 tooltip_title=tooltip_html
               )
 
         uri += '\n'
         return uri
     return literal(annotate_highlight(filenode, url_func, **kwargs))
 
 def repo_name_slug(value):
     """Return slug of name of repository
     This function is called on each creation/modification
     of repository to prevent bad names in repo
     """
     slug = remove_formatting(value)
     slug = strip_tags(slug)
 
     for c in """=[]\;'"<>,/~!@#$%^&*()+{}|: """:
         slug = slug.replace(c, '-')
     slug = recursive_replace(slug, '-')
     slug = collapse(slug, '-')
     return slug
 
 def get_changeset_safe(repo, rev):
     from vcs.backends.base import BaseRepository
     from vcs.exceptions import RepositoryError
     if not isinstance(repo, BaseRepository):
         raise Exception('You must pass an Repository '
                         'object as first argument got %s', type(repo))
 
     try:
         cs = repo.get_changeset(rev)
     except RepositoryError:
         from rhodecode.lib.utils import EmptyChangeset
         cs = EmptyChangeset()
     return cs
 
 
 flash = _Flash()
 
 
 #==============================================================================
 # MERCURIAL FILTERS available via h.
 #==============================================================================
 from mercurial import util
 from mercurial.templatefilters import person as _person
 
 
 
 def _age(curdate):
     """turns a datetime into an age string."""
 
     if not curdate:
         return ''
 
     from datetime import timedelta, datetime
 
     agescales = [("year", 3600 * 24 * 365),
                  ("month", 3600 * 24 * 30),
                  ("day", 3600 * 24),
                  ("hour", 3600),
                  ("minute", 60),
                  ("second", 1), ]
 
     age = datetime.now() - curdate
     age_seconds = (age.days * agescales[2][1]) + age.seconds
     pos = 1
     for scale in agescales:
         if scale[1] <= age_seconds:
             if pos == 6:pos = 5
             return time_ago_in_words(curdate, agescales[pos][0]) + ' ' + _('ago')
         pos += 1
 
     return _('just now')
 
 age = lambda  x:_age(x)
 capitalize = lambda x: x.capitalize()
 email = util.email
 email_or_none = lambda x: util.email(x) if util.email(x) != x else None
 person = lambda x: _person(x)
 short_id = lambda x: x[:12]
 
 
 def action_parser(user_log):
     """
     This helper will map the specified string action into translated
     fancy names with icons and links
     
     @param action:
     """
     action = user_log.action
     action_params = None
     cs_links = ''
 
     x = action.split(':')
 
     if len(x) > 1:
         action, action_params = x
 
     if action == 'push':
         revs_limit = 5
         revs = action_params.split(',')
         cs_links = " " + ', '.join ([link(rev,
                 url('changeset_home',
                 repo_name=user_log.repository.repo_name,
                 revision=rev)) for rev in revs[:revs_limit] ])
         if len(revs) > revs_limit:
             html_tmpl = '<span title="%s"> %s </span>'
             cs_links += html_tmpl % (', '.join(r for r in revs[revs_limit:]),
                                      _('and %s more revisions') % (len(revs) - revs_limit))
 
     map = {'user_deleted_repo':_('User deleted repository'),
            'user_created_repo':_('User created repository'),
            'user_forked_repo':_('User forked repository'),
            'user_updated_repo':_('User updated repository'),
            'admin_deleted_repo':_('Admin delete repository'),
            'admin_created_repo':_('Admin created repository'),
            'admin_forked_repo':_('Admin forked repository'),
            'admin_updated_repo':_('Admin updated repository'),
            'push':_('Pushed') + literal(cs_links),
            'pull':_('Pulled'), }
 
     print action, action_params
     return map.get(action, action)
 
 
 #==============================================================================
 # PERMS
 #==============================================================================
 from rhodecode.lib.auth import HasPermissionAny, HasPermissionAll, \
 HasRepoPermissionAny, HasRepoPermissionAll
 
 #==============================================================================
 # GRAVATAR URL
 #==============================================================================
 import hashlib
 import urllib
 from pylons import request
 
 def gravatar_url(email_address, size=30):
     ssl_enabled = 'https' == request.environ.get('HTTP_X_URL_SCHEME')
     default = 'identicon'
     baseurl_nossl = "http://www.gravatar.com/avatar/"
     baseurl_ssl = "https://secure.gravatar.com/avatar/"
     baseurl = baseurl_ssl if ssl_enabled else baseurl_nossl
 
 
     # construct the url
     gravatar_url = baseurl + hashlib.md5(email_address.lower()).hexdigest() + "?"
     gravatar_url += urllib.urlencode({'d':default, 's':str(size)})
 
     return gravatar_url
 
 def safe_unicode(str):
     """safe unicode function. In case of UnicodeDecode error we try to return
     unicode with errors replace, if this failes we return unicode with 
     string_escape decoding """
 
     try:
         u_str = unicode(str)
     except UnicodeDecodeError:
         try:
             u_str = unicode(str, 'utf-8', 'replace')
         except UnicodeDecodeError:
             #incase we have a decode error just represent as byte string
             u_str = unicode(str(str).encode('string_escape'))
 
     return u_str

rhodecode/templates/admin/repos/repo_edit.html

@@ -1,282 +1,283 b''
 ## -*- 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}"
 </%def>
 
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- 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 input-medium">
                     ${h.text('repo_name',class_="small")}
                 </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_="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="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">
                     <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.repo_to_perm:
                             %if r2p.user.username =='default' and c.repo_info.private:
                                 <tr>
                                     <td colspan="4">
                                         <span class="private_repo_msg">
                                         ${_('private repository')}
                                         </span>
                                     </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);},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('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+              ${h.submit('save','Save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+              ${h.reset('reset','Reset',class_="ui-button ui-widget ui-state-default ui-corner-all")}
             </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_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>
 </%def> 
  No newline at end of file

rhodecode/templates/admin/settings/settings.html

@@ -1,178 +1,180 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('Settings administration')} - ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; ${_('Settings')}
 </%def>
 
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}       
     </div>
     <!-- end box / title -->
     
     <h3>${_('Remap and rescan repositories')}</h3>
     ${h.form(url('admin_setting', setting_id='mapping'),method='put')}
     <div class="form">
         <!-- fields -->
         
         <div class="fields">
 			<div class="field">
 		        <div class="label label-checkbox">
 		            <label for="destroy">${_('rescan option')}:</label>
 		        </div>
 		        <div class="checkboxes">
 		            <div class="checkbox">
 		                ${h.checkbox('destroy',True)}
 		                <label for="checkbox-1">
 		                <span class="tooltip" tooltip_title="${h.tooltip(_('In case a repository was deleted from filesystem and there are leftovers in the database check this option to scan obsolete data in database and remove it.'))}">
 		                ${_('destroy old data')}</span> </label>
 		            </div>
 		        </div>
 			</div>
                             
             <div class="buttons">
-            ${h.submit('rescan','rescan repositories',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+            ${h.submit('rescan','Rescan repositories',class_="ui-button ui-widget ui-state-default ui-corner-all")}
             </div>                                                          
         </div>
     </div>  
     ${h.end_form()}
     
     <h3>${_('Whoosh indexing')}</h3>
     ${h.form(url('admin_setting', setting_id='whoosh'),method='put')}
     <div class="form">
         <!-- fields -->
         
         <div class="fields">
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="destroy">${_('index build option')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('full_index',True)}
                         <label for="checkbox-1">${_('build from scratch')}</label>
                     </div>
                 </div>
             </div>
                             
             <div class="buttons">
-            ${h.submit('reindex','reindex',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+            ${h.submit('reindex','Reindex',class_="ui-button ui-widget ui-state-default ui-corner-all")}
             </div>                                                          
         </div>
     </div>  
     ${h.end_form()}
          
     <h3>${_('Global application settings')}</h3> 
     ${h.form(url('admin_setting', setting_id='global'),method='put')}
     <div class="form">
         <!-- fields -->
         
         <div class="fields">
              
              <div class="field">
                 <div class="label">
                     <label for="rhodecode_title">${_('Application name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('rhodecode_title',size=30)}
                 </div>
              </div>
                           
             <div class="field">
                 <div class="label">
                     <label for="rhodecode_realm">${_('Realm text')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('rhodecode_realm',size=30)}
                 </div>
             </div>
                                      
             <div class="buttons">
-                ${h.submit('save','save settings',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+                ${h.submit('save','Save settings',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+                ${h.reset('reset','Reset',class_="ui-button ui-widget ui-state-default ui-corner-all")}
            </div>                                                          
         </div>
     </div>      
     ${h.end_form()}
 
     <h3>${_('Mercurial settings')}</h3> 
     ${h.form(url('admin_setting', setting_id='mercurial'),method='put')}
     <div class="form">
         <!-- fields -->
         
         <div class="fields">
              
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="web_push_ssl">${_('Web')}:</label>
                 </div>
                 <div class="checkboxes">
 					<div class="checkbox">
 						${h.checkbox('web_push_ssl','true')}
 						<label for="web_push_ssl">${_('require ssl for pushing')}</label>
 					</div>
 				</div>
              </div>						
 
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="web_push_ssl">${_('Hooks')}:</label>
                 </div>
                 <div class="checkboxes">
 					<div class="checkbox">
 						${h.checkbox('hooks_changegroup_update','True')}
 						<label for="hooks_changegroup_update">${_('Update repository after push (hg update)')}</label>
 					</div>
 					<div class="checkbox">
 						${h.checkbox('hooks_changegroup_repo_size','True')}
 						<label for="hooks_changegroup_repo_size">${_('Show repository size after push')}</label>
 					</div>
                     <div class="checkbox">
                         ${h.checkbox('hooks_pretxnchangegroup_push_logger','True')}
                         <label for="hooks_pretxnchangegroup_push_logger">${_('Log user push commands')}</label>
                     </div>
                     <div class="checkbox">
                         ${h.checkbox('hooks_preoutgoing_pull_logger','True')}
                         <label for="hooks_preoutgoing_pull_logger">${_('Log user pull commands')}</label>
                     </div>                    										
 				</div>
              </div>	
 							                          
             <div class="field">
                 <div class="label">
                     <label for="paths_root_path">${_('Repositories location')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('paths_root_path',size=30,readonly="readonly")}			                    
 					<span id="path_unlock" class="tooltip" 
 						tooltip_title="${h.tooltip(_('This a crucial application setting. If You really sure you need to change this, you must restart application in order to make this settings take effect. Click this label to unlock.'))}">
 		                ${_('unlock')}</span>
                 </div>
             </div>
                                      
             <div class="buttons">
-                ${h.submit('save','save settings',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+                ${h.submit('save','Save settings',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+                ${h.reset('reset','Reset',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(){
             YAHOO.util.Event.addListener('path_unlock','click',function(){
                 YAHOO.util.Dom.get('paths_root_path').removeAttribute('readonly');
             });
         });
     </script>
 </div>
 </%def>    

rhodecode/templates/admin/users/user_edit.html

@@ -1,110 +1,111 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('Edit user')} ${c.user.username} - ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))} 
     &raquo; 
     ${h.link_to(_('Users'),h.url('users'))} 
     &raquo;
     ${_('edit')} "${c.user.username}"
 </%def>
 
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}       
     </div>
     <!-- end box / title -->
     ${h.form(url('user', id=c.user.user_id),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="gravatar_box">
               		<div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
               		<p>
               		<strong>Change your avatar at <a href="http://gravatar.com">gravatar.com</a></strong><br/> 
               		${_('Using')} ${c.user.email}
               		</p>
             	</div>
              </div>        
         
              <div class="field">
                 <div class="label">
                     <label for="username">${_('Username')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('username',class_='small')}
                 </div>
              </div>
             
              <div class="field">
                 <div class="label">
                     <label for="new_password">${_('New password')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('new_password',class_='small')}
                 </div>
              </div>
             
              <div class="field">
                 <div class="label">
                     <label for="name">${_('First Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('name',class_='small')}
                 </div>
              </div>
             
              <div class="field">
                 <div class="label">
                     <label for="lastname">${_('Last Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('lastname',class_='small')}
                 </div>
              </div>
             
              <div class="field">
                 <div class="label">
                     <label for="email">${_('Email')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('email',class_='small')}
                 </div>
              </div>
             
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True)}
                 </div>
              </div>
              
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="admin">${_('Admin')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('admin',value=True)}
                 </div>
              </div>             
             <div class="buttons">
-              ${h.submit('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+              ${h.submit('save','Save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+              ${h.reset('reset','Reset',class_="ui-button ui-widget ui-state-default ui-corner-all")}
             </div>             
     	</div>    
     </div>
     ${h.end_form()}
 </div>    
 </%def>  
  No newline at end of file

rhodecode/templates/admin/users/user_edit_my_account.html

@@ -1,188 +1,192 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('My account')} ${c.rhodecode_user.username} - ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('My Account')}
 </%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>
     <!-- end box / title -->
     <div class="ui-tabs-panel ui-widget-content ui-corner-bottom">
     ${h.form(url('admin_settings_my_account_update'),method='put')}
 	    <div class="form">
 	        <div class="fields">
 	             <div class="field">
 	                <div class="label">
 	                    <label for="username">${_('Username')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('username')}
 	                </div>
 	             </div>
 	            
 	             <div class="field">
 	                <div class="label">
 	                    <label for="new_password">${_('New password')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.password('new_password')}
 	                </div>
 	             </div>
 	            
 	             <div class="field">
 	                <div class="label">
 	                    <label for="name">${_('First Name')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('name')}
 	                </div>
 	             </div>
 	            
 	             <div class="field">
 	                <div class="label">
 	                    <label for="lastname">${_('Last Name')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('lastname')}
 	                </div>
 	             </div>
 	            
 	             <div class="field">
 	                <div class="label">
 	                    <label for="email">${_('Email')}:</label>
 	                </div>
 	                <div class="input">
 	                    ${h.text('email')}
 	                </div>
 	             </div>
 	            
 	            <div class="buttons">
-	              ${h.submit('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+	              ${h.submit('save','Save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+	              ${h.reset('reset','Reset',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+	              
+	              
+	              
 	            </div>             
 	    	</div>
 	    </div>    	
     ${h.end_form()}
     </div>
 </div>    
 
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
         <h5>${_('My repositories')}
         <input class="top-right-rounded-corner top-left-rounded-corner bottom-left-rounded-corner bottom-right-rounded-corner" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
         </h5>   
     </div>
     <!-- end box / title -->
     <div class="table">
 	    <table>
 	    <thead>
             <tr>
             <th class="left">${_('Name')}</th>
             <th class="left">${_('revision')}</th>
             <th colspan="2" class="left">${_('action')}</th>            
 	    </thead>
 	     <tbody>
 	     %if c.user_repos:
 		     %for repo in c.user_repos:
 		        <tr>
 		            <td>
                      %if repo['repo'].dbrepo.repo_type =='hg':
                        <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
                      %elif repo['repo'].dbrepo.repo_type =='git':
                        <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
                      %else:
                        
                      %endif 		            
 		             %if repo['repo'].dbrepo.private:
 		                <img class="icon" alt="${_('private')}" src="/images/icons/lock.png"/>
 		             %else:
 		                <img class="icon" alt="${_('public')}" src="/images/icons/lock_open.png"/>
 		             %endif
 		                                             
 		            ${h.link_to(repo['repo'].name, h.url('summary_home',repo_name=repo['repo'].name),class_="repo_name")}
 		            %if repo['repo'].dbrepo.fork:
 		            	<a href="${h.url('summary_home',repo_name=repo['repo'].dbrepo.fork.repo_name)}">
 		            	<img class="icon" alt="${_('public')}"
 		            	title="${_('Fork of')} ${repo['repo'].dbrepo.fork.repo_name}" 
 		            	src="/images/icons/arrow_divide.png"/></a>
 		            %endif		            
 		            </td> 
 		            <td><span class="tooltip" tooltip_title="${repo['repo'].last_change}">${("r%s:%s") % (h.get_changeset_safe(repo['repo'],'tip').revision,h.short_id(h.get_changeset_safe(repo['repo'],'tip').raw_id))}</span></td>
 		            <td><a href="${h.url('repo_settings_home',repo_name=repo['repo'].name)}" title="${_('edit')}"><img class="icon" alt="${_('private')}" src="/images/icons/application_form_edit.png"/></a></td>
 		            <td>
 	                  ${h.form(url('repo_settings_delete', repo_name=repo['repo'].name),method='delete')}
 	                    ${h.submit('remove_%s' % repo['repo'].name,'',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
 	                  ${h.end_form()}	            
 		            </td>
 		        </tr>
 		     %endfor
 	     %else:
 	     	${_('No repositories yet')} 
 	     	%if h.HasPermissionAny('hg.admin','hg.create.repository')():
 	     		${h.link_to(_('create one now'),h.url('admin_settings_create_repository'))}
 	     	%endif
 	     %endif
 	     </tbody>
 	     </table>
     </div>
     
 </div>
     <script type="text/javascript">
      var D = YAHOO.util.Dom;
      var E = YAHOO.util.Event;
      var S = YAHOO.util.Selector;
      
      var q_filter = D.get('q_filter');
      var F = YAHOO.namespace('q_filter'); 
      
      E.on(q_filter,'click',function(){
         q_filter.value = '';
      });
 
      F.filterTimeout = null;
      
      F.updateFilter  = function() { 
         // Reset timeout 
         F.filterTimeout = null;
         
         var obsolete = [];
         var nodes = S.query('div.table tr td a.repo_name');
         var req = D.get('q_filter').value;
         for (n in nodes){
             D.setStyle(nodes[n].parentNode.parentNode,'display','')
         }
         if (req){
             for (n in nodes){
                 if (nodes[n].innerHTML.toLowerCase().indexOf(req) == -1) {
                     obsolete.push(nodes[n]); 
                 }
             }
             if(obsolete){
                 for (n in obsolete){
                     D.setStyle(obsolete[n].parentNode.parentNode,'display','none');
                 }
             }
         }
      }
      
      E.on(q_filter,'keyup',function(e){
          clearTimeout(F.filterTimeout); 
          setTimeout(F.updateFilter,600); 
      });
      
     </script>
 </%def>  
  No newline at end of file

rhodecode/templates/settings/repo_settings.html

@@ -1,262 +1,263 b''
 ## -*- 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(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">
                     <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.repo_to_perm:
                             %if r2p.user.username =='default' and c.repo_info.private:
                                 <tr>
                                     <td colspan="4">
                                         <span class="private_repo_msg">
                                         ${_('private repository')}
                                         </span>
                                     </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);},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")}
+              ${h.submit('update','Update',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+              ${h.reset('reset','Reset',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) ||
                         (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>