kallithea Changeset - cdf89e722ef6

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

kallithea/templates/admin/notifications/show_notification.html

kallithea/templates/files/files.html

kallithea/templates/files/files_add.html

kallithea/templates/files/files_delete.html

kallithea/templates/files/files_edit.html

kallithea/tests/functional/test_files.py

0 comments (0 inline, 0 general)

kallithea/templates/admin/notifications/notifications.html

➞

Show inline comments

@@ @@ -18,17 +18,12 @@ @@
 <%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>

kallithea/templates/admin/notifications/show_notification.html

➞

Show inline comments

@@ @@ -20,17 +20,12 @@ @@
 <%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)}"/>

kallithea/templates/files/files.html

➞

Show inline comments

@@ @@ -27,13 +27,13 @@ ${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'/>

kallithea/templates/files/files_add.html

➞

Show inline comments

@@ @@ -30,14 +30,13 @@ ${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")}

kallithea/templates/files/files_delete.html

➞

Show inline comments

@@ @@ -30,14 +30,13 @@ ${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")}

kallithea/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -30,14 +30,13 @@ ${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>

kallithea/tests/functional/test_files.py

➞

Show inline comments

@@ @@ -70,13 +70,13 @@ class TestFilesController(TestController @@
         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'),
@@ @@ -102,13 +102,13 @@ class TestFilesController(TestController @@
 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',

0 comments (0 inline, 0 general)