gists: block id input for public gists.

fixes  #5655

rhodecode/templates/admin/gists/gist_index.mako

@@ -1,147 +1,147 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     %if c.show_private:
         ${_('Private Gists for user {}').format(c.rhodecode_user.username)}
     %elif c.show_public:
         ${_('Public Gists for user {}').format(c.rhodecode_user.username)}
     %else:
         ${_('Public Gists')}
     %endif
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='gists')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
     <div class="title">
 
     <ul class="button-links">
       % if c.is_super_admin:
-        <li class="btn ${h.is_active('all', c.active)}"><a href="${h.route_path('gists_show', _query={'all': 1})}">${_('All gists')}</a></li>
+        <li><a class="btn ${h.is_active('all', c.active)}" href="${h.route_path('gists_show', _query={'all': 1})}">${_('All gists')}</a></li>
       %endif
-      <li class="btn ${h.is_active('public', c.active)}"><a href="${h.route_path('gists_show')}">${_('All public')}</a></li>
+      <li><a class="btn ${h.is_active('public', c.active)}" href="${h.route_path('gists_show')}">${_('All public')}</a></li>
       %if c.rhodecode_user.username != h.DEFAULT_USER:
-        <li class="btn ${h.is_active('my_all', c.active)}"><a href="${h.route_path('gists_show', _query={'public':1, 'private': 1})}">${_('My gists')}</a></li>
-        <li class="btn ${h.is_active('my_private', c.active)}"><a href="${h.route_path('gists_show', _query={'private': 1})}">${_('My private')}</a></li>
-        <li class="btn ${h.is_active('my_public', c.active)}"><a href="${h.route_path('gists_show', _query={'public': 1})}">${_('My public')}</a></li>
+        <li><a class="btn ${h.is_active('my_all', c.active)}" href="${h.route_path('gists_show', _query={'public':1, 'private': 1})}">${_('My gists')}</a></li>
+        <li><a class="btn ${h.is_active('my_private', c.active)}" href="${h.route_path('gists_show', _query={'private': 1})}">${_('My private')}</a></li>
+        <li><a class="btn ${h.is_active('my_public', c.active)}" href="${h.route_path('gists_show', _query={'public': 1})}">${_('My public')}</a></li>
       %endif
     </ul>
 
     % if c.rhodecode_user.username != h.DEFAULT_USER:
         <div class="pull-right">
             <a class="btn btn-primary" href="${h.route_path('gists_new')}" >
                 ${_(u'Create New Gist')}
             </a>
         </div>
     % endif
 
     <div class="grid-quick-filter">
         <ul class="grid-filter-box">
             <li class="grid-filter-box-icon">
                 <i class="icon-search"></i>
             </li>
             <li class="grid-filter-box-input">
                 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
             </li>
         </ul>
     </div>
 
   </div>
 
     <div class="main-content-full-width">
         <div id="repos_list_wrap">
             <table id="gist_list_table" class="display"></table>
         </div>
     </div>
 
 </div>
 
 <script type="text/javascript">
 $(document).ready(function() {
 
     var get_datatable_count = function(){
       var api = $('#gist_list_table').dataTable().api();
       $('#gists_count').text(api.page.info().recordsDisplay);
     };
 
 
     // custom filter that filters by access_id, description or author
     $.fn.dataTable.ext.search.push(
         function( settings, data, dataIndex ) {
             var query = $('#q_filter').val();
             var author = data[0].strip();
             var access_id = data[2].strip();
             var description = data[3].strip();
 
             var query_str = (access_id + " " + author + " " + description).toLowerCase();
 
             if(query_str.indexOf(query.toLowerCase()) !== -1){
                 return true;
             }
             return false;
         }
     );
 
     // gists list
     $('#gist_list_table').DataTable({
       data: ${c.data|n},
       dom: 'rtp',
       pageLength: ${c.visual.dashboard_items},
       order: [[ 4, "desc" ]],
       columns: [
          { data: {"_": "author",
                   "sort": "author_raw"}, title: "${_("Author")}", width: "250px", className: "td-user" },
          { data: {"_": "type",
                   "sort": "type"}, title: "${_("Type")}", width: "100px", className: "td-gist-type" },
          { data: {"_": "access_id",
                   "sort": "access_id"}, title: "${_("Name")}", width:"150px", className: "td-componentname" },
          { data: {"_": "description",
                   "sort": "description"}, title: "${_("Description")}", width: "250px", className: "td-description" },
          { data: {"_": "created_on",
                   "sort": "created_on_raw"}, title: "${_("Created on")}", className: "td-time" },
          { data: {"_": "expires",
                   "sort": "expires"}, title: "${_("Expires")}", width: "200px", className: "td-expire" }
       ],
       language: {
           paginate: DEFAULT_GRID_PAGINATION,
           emptyTable: _gettext("No gists available yet.")
       },
       "initComplete": function( settings, json ) {
           timeagoActivate();
           tooltipActivate();
           get_datatable_count();
       }
     });
 
     // update the counter when things change
     $('#gist_list_table').on('draw.dt', function() {
         timeagoActivate();
         tooltipActivate();
         get_datatable_count();
     });
 
     // filter, filter both grids
     $('#q_filter').on( 'keyup', function () {
       var repo_api = $('#gist_list_table').dataTable().api();
       repo_api
         .draw();
     });
 
     // refilter table if page load via back button
     $("#q_filter").trigger('keyup');
 
   });
 
 </script>
 </%def>
 

rhodecode/templates/admin/gists/gist_new.mako

@@ -1,103 +1,112 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
     ${_('New Gist')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='gists')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
 
     </div>
 
     <div class="table">
         <div id="files_data">
           ${h.secure_form(h.route_path('gists_create'), id='eform', request=request)}
             <div>
                 <span class="gist-gravatar">
                     ${self.gravatar(c.rhodecode_user.email, 30)}
                 </span>
                 <label for='gistid'>${_('Gist id')}</label>
                 ${h.text('gistid', placeholder=_('Auto generated'))}
 
                 <label for='lifetime'>${_('Gist lifetime')}</label>
                 ${h.dropdownmenu('lifetime', '', c.lifetime_options)}
 
                 <label for='acl_level'>${_('Private Gist access level')}</label>
                 ${h.dropdownmenu('gist_acl_level', '', c.acl_options)}
 
                 <textarea style="margin-top: 5px; border-color: #dbd9da" id="description" name="description" placeholder="${_('Gist description ...')}"></textarea>
             </div>
 
             <div id="codeblock" class="codeblock">
                 <div class="code-header">
                     <div class="form">
                         <div class="fields">
                             ${h.text('filename', size=30, placeholder=_('name gist file...'))}
                             ${h.dropdownmenu('mimetype','plain',[('plain',_('plain'))],enable_filter=True)}
                         </div>
                     </div>
                 </div>
 
                 <div id="editor_container">
                     <div id="editor_pre"></div>
                     <textarea id="editor" name="content" ></textarea>
                 </div>
             </div>
 
             <div class="pull-left">
                 <div class="pull-right">
                     ${h.submit('create',_('Create Gist'),class_="btn")}
                 </div>
                 <div class="rcform-element pull-right">
                   <div class="fields gist-type-fields">
                     <fieldset>
                         <div class="gist-type-fields-wrapper">
 
-                        <input type="radio" id="private_gist" checked="" name="gist_type" value="private">
+                        <input type="radio" id="private_gist" checked="" name="gist_type" value="private" onchange="setGistId('private')">
                         <label for="private_gist">${_('Private Gist')}</label>
                         <span class="tooltip label" title="${_('Private Gists are not listed and only accessible through their secret url.')}">${_('Private Gist')}</span>
 
-                        <input type="radio" id="public_gist" name="gist_type" value="public">
+                        <input type="radio" id="public_gist" name="gist_type" value="public" onchange="setGistId('public')">
                         <label for="public_gist">${_('Public Gist')}</label>
                         <span class="tooltip label" title="${_('Public Gists are accessible to anyone and listed in Gists page.')}">${_('Public Gist')}</span>
                         </div>
                     </fieldset>
                   </div>
                 </div>
 
             </div>
             ${h.end_form()}
         </div>
     </div>
 
 </div>
 
 <script type="text/javascript">
     var myCodeMirror = initCodeMirror('editor', '');
 
     var modes_select = $('#mimetype');
     fillCodeMirrorOptions(modes_select);
 
     var filename_selector = '#filename';
     // on change of select field set mode
     setCodeMirrorModeFromSelect(
             modes_select, filename_selector, myCodeMirror, null);
 
     // on entering the new filename set mode, from given extension
     setCodeMirrorModeFromInput(
         modes_select, filename_selector, myCodeMirror, null);
 
+    setGistId = function(gistType) {
+        if (gistType === 'private') {
+            $('#gistid').removeAttr('disabled');
+        }
+        else {
+            $('#gistid').val('');
+            $('#gistid').attr('disabled', 'disabled')
+        }
+    }
 </script>
 </%def>