Changeset - 488a411b989b
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Sean Farley - 11 years ago 2015-01-26 22:10:24
sean.michael.farley@gmail.com
admin: drop unnecessary use of h.email_or_none when we already have an email address
5 files changed with 5 insertions and 5 deletions:
kallithea/templates/admin/gists/edit.html
1
1
kallithea/templates/admin/gists/index.html
1
1
kallithea/templates/admin/gists/new.html
1
1
kallithea/templates/admin/notifications/notifications_data.html
1
1
kallithea/templates/admin/notifications/show_notification.html
1
1
0 comments (0 inline, 0 general)
kallithea/templates/admin/gists/edit.html
➞
Show inline comments
 
@@ -29,49 +29,49 @@
 
<div class="box">
 
    <!-- box / title -->
 
    <div class="title">
 
        ${self.breadcrumbs()}
 
    </div>
 

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div id="edit_error" style="display: none" class="flash_msg">

			




	
	
	
		
 
            <div class="alert alert-dismissable alert-warning">

			




	
	
	
		
 
              <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><i class="icon-cancel-circled"></i></button>

			




	
	
	
		
 
              ${h.literal(_('Gist was update since you started editing. Copy your changes and click %(here)s to reload new version.')

			




	
	
	
		
 
                             % {'here': h.link_to('here',h.url('edit_gist', gist_id=c.gist.gist_access_id))})}

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <script>

			




	
	
	
		
 
            if (typeof jQuery != 'undefined') {

			




	
	
	
		
 
                $(".alert").alert();

			




	
	
	
		
 
            }

			




	
	
	
		
 
            </script>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div id="files_data">

			




	
	
	
		
 
          ${h.form(h.url('edit_gist', gist_id=c.gist.gist_access_id), method='post', id='eform')}

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
                <div class="gravatar">

			




	
	
	
		
 
                   <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.authuser.full_contact),32)}"/>

			




	
	
	
		
 
                   <img alt="gravatar" src="${h.gravatar_url(c.authuser.email,32)}"/>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <input type="hidden" value="${c.file_changeset.raw_id}" name="parent_hash">

			




	
	
	
		
 
                <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;"

			




	
	
	
		
 
                          id="description" name="description"

			




	
	
	
		
 
                          placeholder="${_('Gist description ...')}">${c.gist.gist_description}</textarea>

			




	
	
	
		
 
                <div style="padding:0px 0px 0px 42px">

			




	
	
	
		
 
                    <label for='lifetime'>${_('Gist lifetime')}</label>

			




	
	
	
		
 
                    ${h.select('lifetime', '0', c.lifetime_options)}

			




	
	
	
		
 
                    <span class="" style="color: #AAA">

			




	
	
	
		
 
                     %if c.gist.gist_expires == -1:

			




	
	
	
		
 
                      ${_('Expires')}: ${_('never')}

			




	
	
	
		
 
                     %else:

			




	
	
	
		
 
                      ${_('Expires')}: ${h.age(h.time_to_datetime(c.gist.gist_expires))}

			




	
	
	
		
 
                     %endif

			




	
	
	
		
 
                   </span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            % for cnt, file in enumerate(c.files):

			




	
	
	
		
 
                <div id="body" class="codeblock" style="margin-bottom: 4px">

			




	
	
	
		
 
                    <div style="padding: 10px 10px 10px 26px;color:#666666">

			




	
	
	
		
 
                        <input type="hidden" value="${file.path}" name="org_files">

			




	
	
	
		
 
                        <input id="filename_${h.FID('f',file.path)}" name="files" size="30" type="text" value="${file.path}">

			




	
	
	
		
 
                        <select id="mimetype_${h.FID('f',file.path)}" name="mimetypes"/>

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/gists/index.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -26,49 +26,49 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('gists')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        %if c.authuser.username != 'default':

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
          <li>

			




	
	
	
		
 
             <a href="${h.url('new_gist')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_(u'Create New Gist')}</a>

			




	
	
	
		
 
          </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %if c.gists_pager.item_count>0:

			




	
	
	
		
 
        % for gist in c.gists_pager:

			




	
	
	
		
 
          <div class="gist-item" style="padding:10px 20px 10px 15px">

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="gravatar">

			




	
	
	
		
 
               <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(gist.owner.full_contact),28)}"/>

			




	
	
	
		
 
               <img alt="gravatar" src="${h.gravatar_url(gist.owner.email,28)}"/>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div title="${gist.owner.full_contact}" class="user" style="font-size: 16px">

			




	
	
	
		
 
                <b>${h.person(gist.owner.full_contact)}</b> /

			




	
	
	
		
 
                <b><a href="${h.url('gist',gist_id=gist.gist_access_id)}">gist: ${gist.gist_access_id}</a></b>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="padding: 4px 0px 0px 0px">

			




	
	
	
		
 
                ${_('Created')} ${h.age(gist.created_on)} /

			




	
	
	
		
 
                <span style="color: #AAA">

			




	
	
	
		
 
                  %if gist.gist_expires == -1:

			




	
	
	
		
 
                   ${_('Expires')}: ${_('never')}

			




	
	
	
		
 
                  %else:

			




	
	
	
		
 
                   ${_('Expires')}: ${h.age(h.time_to_datetime(gist.gist_expires))}

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div style="border:0px;padding:10px 0px 0px 40px;color:#AAA">${gist.gist_description}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        % endfor

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="notification-paginator">

			




	
	
	
		
 
          <div class="pagination-wh pagination-left">

			




	
	
	
		
 
          ${c.gists_pager.pager('$link_previous ~2~ $link_next', **request.GET.mixed())}

			




	
	
	
		
 
          </div>

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/gists/new.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -16,49 +16,49 @@

			




	
	
	
		
 
<%def name="css_extra()">

			




	
	
	
		
 
<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('New Gist')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('gists')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div id="files_data">

			




	
	
	
		
 
          ${h.form(h.url('gists'), method='post',id='eform')}

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
                <div class="gravatar">

			




	
	
	
		
 
                   <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.authuser.full_contact),32)}"/>

			




	
	
	
		
 
                   <img alt="gravatar" src="${h.gravatar_url(c.authuser.email,32)}"/>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;" id="description" name="description" placeholder="${_('Gist description ...')}"></textarea>

			




	
	
	
		
 
                <div style="padding:0px 0px 0px 42px">

			




	
	
	
		
 
                <label for='lifetime'>${_('Gist lifetime')}</label>

			




	
	
	
		
 
                ${h.select('lifetime', '', c.lifetime_options)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="body" class="codeblock">

			




	
	
	
		
 
                <div style="padding: 10px 10px 10px 26px;color:#666666">

			




	
	
	
		
 
                    ${h.text('filename', size=30, placeholder=_('name this file...'))}

			




	
	
	
		
 
                    <select id="mimetype" name="mimetype"/>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div id="editor_container">

			




	
	
	
		
 
                    <pre id="editor_pre"></pre>

			




	
	
	
		
 
                    <textarea id="editor" name="content" style="display:none"></textarea>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="padding-top: 5px">

			




	
	
	
		
 
            ${h.submit('private',_('Create Private Gist'),class_="btn btn-mini btn-success")}

			




	
	
	
		
 
            ${h.submit('public',_('Create Public Gist'),class_="btn btn-mini")}

			




	
	
	
		
 
            ${h.reset('reset',_('Reset'),class_="btn btn-mini")}

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            ${h.end_form()}

			




	
	
	
		
 
            <script type="text/javascript">

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/notifications/notifications_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 

			




	
	
	
		
 
%if c.notifications:

			




	
	
	
		
 
<%

			




	
	
	
		
 
unread = lambda n:{False:'unread'}.get(n)

			




	
	
	
		
 
%>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<div class="notification-list  notification-table">

			




	
	
	
		
 
%for notification in c.notifications:

			




	
	
	
		
 
  <div id="notification_${notification.notification.notification_id}" class="container ${unread(notification.read)}">

			




	
	
	
		
 
    <div class="notification-header">

			




	
	
	
		
 
      <div class="gravatar">

			




	
	
	
		
 
          <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(notification.notification.created_by_user.email),24)}"/>

			




	
	
	
		
 
          <img alt="gravatar" src="${h.gravatar_url(notification.notification.created_by_user.email,24)}"/>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="desc ${unread(notification.read)}">

			




	
	
	
		
 
      <a href="${url('notification', notification_id=notification.notification.notification_id)}">${notification.notification.description}</a>

			




	
	
	
		
 

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="delete-notifications">

			




	
	
	
		
 
        <span id="${notification.notification.notification_id}" class="delete-notification"><i class="icon-minus-circled" id="yui-gen24" style="color: #b94a48; padding: 2px;"></i></span>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      %if not notification.read:

			




	
	
	
		
 
      <div class="read-notifications">

			




	
	
	
		
 
        <span id="${notification.notification.notification_id}" class="read-notification"><i class="icon-ok" id="yui-gen24" style="color: #4CBB17; padding: 2px;"></i></span>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      %endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
        <div class="notification-subject"></div>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
%endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<div class="notification-paginator">

			




	
	
	
		
 
  <div class="pagination-wh pagination-left">

			




	
	
	
		
 
  ${c.notifications.pager('$link_previous ~2~ $link_next',**request.GET.mixed())}

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</div>

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/notifications/show_notification.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
        &middot; ${c.site_name}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${h.link_to(_('Notifications'),h.url('notifications'))}

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${_('Show Notification')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('admin')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
      <div id="notification_${c.notification.notification_id}">

			




	
	
	
		
 
        <div class="notification-header">

			




	
	
	
		
 
          <div class="gravatar">

			




	
	
	
		
 
              <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.notification.created_by_user.email),24)}"/>

			




	
	
	
		
 
              <img alt="gravatar" src="${h.gravatar_url(c.notification.created_by_user.email,24)}"/>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="desc">

			




	
	
	
		
 
              ${c.notification.description}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="delete-notifications">

			




	
	
	
		
 
            <span id="${c.notification.notification_id}" class="delete-notification action"><i class="icon-minus-circled" id="yui-gen24"></i></span>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="notification-body">

			




	
	
	
		
 
        <div class="notification-subject">${h.literal(c.notification.subject)}</div>

			




	
	
	
		
 
        %if c.notification.body:

			




	
	
	
		
 
            ${h.rst_w_mentions(c.notification.body)}

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
var url = "${url('notification', notification_id='__NOTIFICATION_ID__')}";

			




	
	
	
		
 
var main = "${url('notifications')}";

			




	
	
	
		
 
   $('.delete-notification').click(function(e){

			




	
	
	
		
 
       var notification_id = e.currentTarget.id;

			




	
	
	
		
 
       deleteNotification(url,notification_id,[function(){window.location=main}])

			




	
	
	
		
 
   });

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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