Changeset - cdf89e722ef6
Parent rev.
Child rev.
[Not reviewed]
default
0 7 0
Mads Kiilerich - 11 years ago 2014-07-18 18:44:54
madski@unity3d.com
templates: don't use explicit uppercase style - shouting is rude
7 files changed with 6 insertions and 19 deletions:
kallithea/templates/admin/notifications/notifications.html
5
kallithea/templates/admin/notifications/show_notification.html
5
kallithea/templates/files/files.html
1
1
kallithea/templates/files/files_add.html
1
2
kallithea/templates/files/files_delete.html
1
2
kallithea/templates/files/files_edit.html
1
2
kallithea/tests/functional/test_files.py
2
2
0 comments (0 inline, 0 general)
kallithea/templates/admin/notifications/notifications.html
➞
Show inline comments
 
@@ -12,29 +12,24 @@
 
    ${_('My Notifications')}
 
</%def>
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('admin')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        ##<ul class="links">

			




	
	
	
		
 
        ##    <li>

			




	
	
	
		
 
        ##      <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>

			




	
	
	
		
 
        ##    </li>

			




	
	
	
		
 
        ##</ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
      <div style="padding:14px 18px;text-align: right;float:left">

			




	
	
	
		
 
      <span id='all' class="btn btn-mini"><a href="${h.url.current()}">${_('All')}</a></span>

			




	
	
	
		
 
      <span id='comment' class="btn btn-mini"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>

			




	
	
	
		
 
      <span id='pull_request' class="btn btn-mini"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      %if c.notifications:

			




	
	
	
		
 
      <div style="padding:14px 18px;text-align: right;float:right">

			




	
	
	
		
 
      <span id='mark_all_read' class="btn btn-mini">${_('Mark all read')}</span>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      %endif

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/notifications/show_notification.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -14,29 +14,24 @@

			




	
	
	
		
 
    ${_('Show notification')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('admin')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        ##<ul class="links">

			




	
	
	
		
 
        ##    <li>

			




	
	
	
		
 
        ##      <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>

			




	
	
	
		
 
        ##    </li>

			




	
	
	
		
 
        ##</ul>

			




	
	
	
		
 
    </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)}"/>

			




	
	
	
		
 
          </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-sign" id="yui-gen24"></i></span>

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -21,25 +21,25 @@

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('files')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
            <li>

			




	
	
	
		
 
              <span style="text-transform: uppercase;"><a href="#">${_('Branch')}: ${c.changeset.branch}</a></span>

			




	
	
	
		
 
              <span><a href="#">${_('Branch')}: ${c.changeset.branch}</a></span>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div id="files_data">

			




	
	
	
		
 
            <%include file='files_ypjax.html'/>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
var CACHE = {};

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_add.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,26 +24,25 @@

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Add new file')} @ ${h.show_id(c.cs)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('files')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
            <li>

			




	
	
	
		
 
              <span style="text-transform: uppercase;">

			




	
	
	
		
 
              <a href="#">${_('Branch')}: ${c.cs.branch}</a></span>

			




	
	
	
		
 
              <span><a href="#">${_('Branch')}: ${c.cs.branch}</a></span>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table" id="edit">

			




	
	
	
		
 
        <div id="files_data">

			




	
	
	
		
 
          ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-horizontal")}

			




	
	
	
		
 
          <h3 class="files_location">

			




	
	
	
		
 
            ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.f_path)} /

			




	
	
	
		
 
              <span id="filename_container" class="file reviewer_ac">

			




	
	
	
		
 
                  <input class="input-small" type="text" value="" size="30" name="filename" id="filename" placeholder="${_('Enter filename...')}">

			




	
	
	
		
 
                  <input type="hidden" value="${c.f_path}" size="30" name="location" id="location">

			




	
	
	
		
 
                  ${_('or')} <div class="btn btn-small" id="upload_file_enable">${_('Upload File')}</div>

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_delete.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,26 +24,25 @@

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Delete file')} @ ${h.show_id(c.cs)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('files')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
            <li>

			




	
	
	
		
 
              <span style="text-transform: uppercase;">

			




	
	
	
		
 
              <a href="#">${_('Branch')}: ${c.cs.branch}</a></span>

			




	
	
	
		
 
              <span><a href="#">${_('Branch')}: ${c.cs.branch}</a></span>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table" id="edit">

			




	
	
	
		
 
        <div id="files_data">

			




	
	
	
		
 
            ${h.form(h.url.current(),method='post',class_="form-horizontal")}

			




	
	
	
		
 
            <h3 class="files_location">

			




	
	
	
		
 
                ${_('Delete file')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.f_path)}

			




	
	
	
		
 
            </h3>

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                <div id="editor_container">

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,26 +24,25 @@

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Edit file')} @ ${h.show_id(c.cs)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('files')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
            <li>

			




	
	
	
		
 
              <span style="text-transform: uppercase;">

			




	
	
	
		
 
              <a href="#">${_('Branch')}: ${c.cs.branch}</a></span>

			




	
	
	
		
 
              <span><a href="#">${_('Branch')}: ${c.cs.branch}</a></span>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table" id="edit">

			




	
	
	
		
 
        <div id="files_data">

			




	
	
	
		
 
            <h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.revision,c.file.path)}</h3>

			




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

			




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

			




	
	
	
		
 
            <div class="code-header">

			




	
	
	
		
 
                <div class="stats">

			




	
	
	
		
 
                    <div class="left"><i class="icon-file"></i></div>

			




	
	
	
		
 
                    <div class="left item">${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</div>

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -64,25 +64,25 @@ class TestFilesController(TestController

			




	
	
	
		
 
        response.mustcontain('<a class="browser-file ypjax-link" href="/vcs_test_hg/files/7ba66bec8d6dbba14a2155be32408c435c5f4492/README.rst">README.rst</a>')

			




	
	
	
		
 
        response.mustcontain('1.1 KiB')

			




	
	
	
		
 
        response.mustcontain('text/x-python')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_different_branch(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='97e8b885c04894463c51898e14387d80c30ed1ee',

			




	
	
	
		
 
                                    f_path='/'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">Branch: git</a></span>""")

			




	
	
	
		
 
        response.mustcontain("""<a href="#">Branch: git</a>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_index_paging(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        for r in [(73, 'a066b25d5df7016b45a41b7e2a78c33b57adc235'),

			




	
	
	
		
 
                  (92, 'cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e'),

			




	
	
	
		
 
                  (109, '75feb4c33e81186c87eac740cee2447330288412'),

			




	
	
	
		
 
                  (1, '3d8f361e72ab303da48d799ff1ac40d5ac37c67e'),

			




	
	
	
		
 
                  (0, 'b986218ba1c9b0d6a259fac9b050b1724ed8e545')]:

			




	
	
	
		
 

			




	
	
	
		
 
            response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
		
 
@@ -96,25 +96,25 @@ class TestFilesController(TestController

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='index',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='8911406ad776fdd3d0b9932a2e89677e57405a48',

			




	
	
	
		
 
                                    f_path='vcs/nodes.py'))

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<div class="commit">Partially implemented <a class="issue-tracker-link" href="https://myissueserver.com/vcs_test_hg/issue/16">#16</a>. filecontent/commit message/author/node name are safe_unicode now.

			




	
	
	
		
 
In addition some other __str__ are unicode as well

			




	
	
	
		
 
Added test for unicode

			




	
	
	
		
 
Improved test to clone into uniq repository.

			




	
	
	
		
 
removed extra unicode conversion in diff.</div>

			




	
	
	
		
 
""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">Branch: default</a></span>""")

			




	
	
	
		
 
        response.mustcontain("""<a href="#">Branch: default</a>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_file_source_history(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='history',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='tip',

			




	
	
	
		
 
                                    f_path='vcs/nodes.py'),

			




	
	
	
		
 
                                extra_environ={'HTTP_X_PARTIAL_XHR': '1'},)

			




	
	
	
		
 
        self.assertEqual(response.body, HG_NODE_HISTORY)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_file_source_history_git(self):

			




	
	
	
		
 
        self.log_user()

			




        

    



    


    



    



      

      





    
    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.