clean template helper function calls

ckan · Mar 28, 2012 · 1458ebb · 1458ebb
1 parent 5a06b6f
commit 1458ebb
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/ckan/templates/authorization_group/layout.html b/ckan/templates/authorization_group/layout.html
@@ -8,15 +8,15 @@
 
   <py:match path="minornavigation">
   <ul class="nav nav-pills">
-    <li class="${'active' if c.action=='index' else ''}">${h.subnav_link(c, h.icon('page_white_stack') + _('List'), controller='authorization_group', action='index')}</li>
+    <li class="${'active' if c.action=='index' else ''}">${h.subnav_link(h.icon('page_white_stack') + _('List'), controller='authorization_group', action='index')}</li>
     <py:if test="c.authorization_group">
       <li class="divider">|</li>
-      <li class="${'active' if c.action=='read' else ''}">${h.subnav_link(c, h.icon('authorization_group') + _('View'), controller='authorization_group', action='read', id=c.authorization_group.name or c.authorization_group.id)}</li>
+      <li class="${'active' if c.action=='read' else ''}">${h.subnav_link(h.icon('authorization_group') + _('View'), controller='authorization_group', action='read', id=c.authorization_group.name or c.authorization_group.id)}</li>
       <li class="${'active' if c.action=='edit' else ''}" py:if="h.check_access('authorization_group_update',{'id':c.authorization_group.id})">
-        ${h.subnav_link(c, h.icon('authorization_group_edit') + _('Edit'), controller='authorization_group', action='edit', id=c.authorization_group.name or c.authorization_group.id)}
+        ${h.subnav_link(h.icon('authorization_group_edit') + _('Edit'), controller='authorization_group', action='edit', id=c.authorization_group.name or c.authorization_group.id)}
       </li>
       <li class="${'active' if c.action=='authz' else ''}" py:if="h.check_access('authorization_group_edit_permissions',{'id':c.authorization_group.id})">
-        ${h.subnav_link(c, h.icon('lock') + _('Authorization'), controller='authorization_group', action='authz', id=c.authorization_group.name or c.authorization_group.id)}
+        ${h.subnav_link(h.icon('lock') + _('Authorization'), controller='authorization_group', action='authz', id=c.authorization_group.name or c.authorization_group.id)}
       </li>
     </py:if>
   </ul>

diff --git a/ckan/templates/group/layout.html b/ckan/templates/group/layout.html
@@ -9,8 +9,8 @@
   <py:match path="minornavigation">
     <ul class="nav nav-pills" py:choose="bool(c.group)">
       <py:when test="True" py:with="can_update=h.check_access('group_update',{'id':c.group.id})">
-        <li class="${'active' if c.action=='read' else ''}">${h.subnav_named_route(c, h.icon('group') + _('View'), c.group.type + '_read',controller='group', action='read', id=c.group.name)}</li>
-        <li class="${'active' if c.action=='history' else ''}">${h.subnav_named_route(c, h.icon('page_white_stack') + _('History'),  c.group.type + '_action', controller='group', action='history', id=c.group.name)}</li>
+        <li class="${'active' if c.action=='read' else ''}">${h.subnav_named_route(h.icon('group') + _('View'), c.group.type + '_read',controller='group', action='read', id=c.group.name)}</li>
+        <li class="${'active' if c.action=='history' else ''}">${h.subnav_named_route(h.icon('page_white_stack') + _('History'),  c.group.type + '_action', controller='group', action='history', id=c.group.name)}</li>
         <li class="divider" py:if="can_update">|</li>
         <li class="dropdown ${'active' if c.action=='resource_read' else ''}" py:if="can_update">
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">${h.icon('add') + _('Add Dataset')}<b class="caret"></b></a>
@@ -21,21 +21,21 @@
         </li>
         <li class="${'active' if c.action=='edit' else ''}" py:if="can_update">
           <!-- TODO: We need to be able to change the URL below based on the type of the group -->
-          ${h.subnav_named_route( c,h.icon('group_edit') + _('Edit'), c.group.type + '_action', action='edit', id=c.group.name )}
+          ${h.subnav_named_route(h.icon('group_edit') + _('Edit'), c.group.type + '_action', action='edit', id=c.group.name )}
         </li>
         <li class="${'active' if c.action=='authz' else ''}" py:if="h.check_access('group_edit_permissions',{'id':c.group.id})">
-          ${h.subnav_named_route(c, h.icon('lock') + _('Authorization'), c.group.type + '_action', controller='group', action='authz', id=c.group.name)}
+          ${h.subnav_named_route(h.icon('lock') + _('Authorization'), c.group.type + '_action', controller='group', action='authz', id=c.group.name)}
         </li>
       </py:when>
       <py:otherwise>
         <li class="${'active' if c.action=='index' else ''}">
-          ${h.subnav_named_route(c, h.icon('group') + _('List Groups'), "%s_index" % h.default_group_type(), action="index" )}
+          ${h.subnav_named_route(h.icon('group') + _('List Groups'), "%s_index" % h.default_group_type(), action="index" )}
         </li>
         <li style="display:none;" class="ckan-logged-in ${'active' if c.action=='new' else ''}">
-          ${ h.subnav_named_route(c, h.icon('group_add') + _('Add a Group'), "%s_new" % h.default_group_type(), action='new')}
+          ${ h.subnav_named_route(h.icon('group_add') + _('Add a Group'), "%s_new" % h.default_group_type(), action='new')}
         </li>
         <li class="ckan-logged-out ${'active' if c.action=='new' else ''}">
-          ${h.subnav_link(c, h.icon('group_add') + _('Login to Add a Group'), controller='group', action='new')}
+          ${h.subnav_link(h.icon('group_add') + _('Login to Add a Group'), controller='group', action='new')}
         </li>
       </py:otherwise>
     </ul>

diff --git a/ckan/templates/home/index.html b/ckan/templates/home/index.html
@@ -34,7 +34,7 @@ <h1>Share data</h1>
           Add your own datasets to share them with others and
           to find other people interested in your data.
 
-          <py:choose test="h.am_authorized(c, actions.PACKAGE_CREATE)">
+          <py:choose test="h.check_access('package_create')">
             <a py:when="" href="${h.url_for(controller='package', action='new')}" class="create-button">Create a dataset &raquo;</a>
             <py:otherwise>
               <a href="${h.url_for(controller='user', action='login')}" class="create-button">Sign up &raquo;</a>

diff --git a/ckan/templates/layout_base.html b/ckan/templates/layout_base.html
@@ -75,13 +75,13 @@
           <div id="mainmenu">
             <span py:if="h.check_access('package_create')">${h.nav_link(_('Add a dataset'), controller='package', action='new')}</span>
             ${h.nav_link(_('Search'), controller='package', action='search', highlight_actions = 'new index')}
-            ${h.nav_named_link(c, _('Groups'), name='%s_index' % h.default_group_type() )}
+            ${h.nav_named_link(_('Groups'), name='%s_index' % h.default_group_type() )}
             ${h.nav_link(_('About'), controller='home', action='about')}
           </div>
         </div>
       </header>
     </div>
-    <py:with vars="messages = list(h._flash.pop_messages())">
+    <py:with vars="messages = list(h.flash.pop_messages())">
     <div class="flash-messages container">
       <div class="alert ${m.category}" py:for="m in messages">
         ${h.literal(m)}

diff --git a/ckan/templates/package/layout.html b/ckan/templates/package/layout.html
@@ -7,7 +7,7 @@
 
   <py:match path="minornavigation" py:if="c.pkg">
     <ul class="nav nav-pills">
-      <li class="${'active' if c.action=='read' else ''}">${h.subnav_link(c, h.icon('package') + _('View'), controller='package', action='read', id=c.pkg.name)}</li>
+      <li class="${'active' if c.action=='read' else ''}">${h.subnav_link(h.icon('package') + _('View'), controller='package', action='read', id=c.pkg.name)}</li>
       <py:choose test="len(c.pkg_dict.get('resources', []))==0 and not h.check_access('package_update',{'id':c.pkg.id})">
       <py:when test="True">
         <li class="disabled">
@@ -34,15 +34,15 @@
         </li>
       </py:otherwise>
       </py:choose>
-      <li class="${'active' if c.action=='history' else ''}">${h.subnav_link(c, h.icon('page_stack') + _('History'), controller='package', action='history', id=c.pkg.name)}</li>
+      <li class="${'active' if c.action=='history' else ''}">${h.subnav_link(h.icon('page_stack') + _('History'), controller='package', action='history', id=c.pkg.name)}</li>
       <py:if test="h.check_access('package_update',{'id':c.pkg.id})">
         <li class="divider">|</li>
         <li class="${'active' if c.action=='edit' else ''}">
-          ${h.subnav_link(c, h.icon('package_edit') + _('Settings'), controller='package', action='edit', id=c.pkg.name)}
+          ${h.subnav_link(h.icon('package_edit') + _('Settings'), controller='package', action='edit', id=c.pkg.name)}
         </li>
       </py:if>
       <li class="${'active' if c.action=='authz' else ''}" py:if="h.check_access('package_edit_permissions',{'id':c.pkg.id})">
-        ${h.subnav_link(c, h.icon('lock') + _('Authorization'), controller='package', action='authz', id=c.pkg.name)}
+        ${h.subnav_link(h.icon('lock') + _('Authorization'), controller='package', action='authz', id=c.pkg.name)}
       </li>
     </ul>
   </py:match>

diff --git a/ckan/templates/package/new_package_form.html b/ckan/templates/package/new_package_form.html
@@ -257,7 +257,7 @@ <h2>Errors in form</h2>
     <label class="control-label" for="log_message">Summary</label>
     <div class="controls">
       <p>Briefly describe the changes you have made...</p>
-      <textarea id="log_message" name="log_message">${data.get('log_message', h.auto_log_message(c))}</textarea>
+      <textarea id="log_message" name="log_message">${data.get('log_message', h.auto_log_message())}</textarea>
     </div>
   </div>
 </fieldset>

diff --git a/ckan/templates/package/read_core.html b/ckan/templates/package/read_core.html
@@ -25,7 +25,7 @@
       <div id="dataset-resources" class="resources subsection">
         <h3>Resources
         <py:if test="h.check_access('package_update',{'id':c.pkg.id})"> &nbsp;
-          ${h.subnav_link(c, _('(edit)'), controller='package', action='editresources', id=c.pkg.name)}
+          ${h.subnav_link(_('(edit)'), controller='package', action='editresources', id=c.pkg.name)}
         </py:if></h3>
         <ul class="resource-list">
           <py:for each="res in c.pkg_dict.get('resources', [])">
@@ -48,7 +48,7 @@ <h3>Resources
     <!-- Dataset Information Section -->
     <h3>Additional Information
       <py:if test="h.check_access('package_update',{'id':c.pkg.id})"> &nbsp;
-        ${h.subnav_link(c, _('(settings)'), controller='package', action='edit', id=c.pkg.name)}
+        ${h.subnav_link(_('(settings)'), controller='package', action='edit', id=c.pkg.name)}
       </py:if></h3>
     <div id="dataset-information">
     <table class="table table-striped table-bordered table-condensed">

diff --git a/ckan/templates/revision/layout.html b/ckan/templates/revision/layout.html
@@ -6,10 +6,10 @@
   >
   <py:match path="minornavigation">
     <ul class="nav nav-pills">
-      <li class="${'active' if c.action=='index' else ''}">${h.subnav_link(c,h.icon('page_white_stack') + _('List'), controller='revision', action='index')}</li>
+      <li class="${'active' if c.action=='index' else ''}">${h.subnav_link(h.icon('page_white_stack') + _('List'), controller='revision', action='index')}</li>
       <py:if test="c.action=='read'">
         <li class="divider">|</li>
-        <li class="${'active' if c.action=='read' else ''}">${h.subnav_link(c,h.icon('page_white') + _('View'), controller='revision', action='read', id=c.id)}</li>
+        <li class="${'active' if c.action=='read' else ''}">${h.subnav_link(h.icon('page_white') + _('View'), controller='revision', action='read', id=c.id)}</li>
       </py:if>
     </ul>
   </py:match>