incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [12/40] git commit: [#6088] ticket:457 fixed template and links
Date Thu, 31 Oct 2013 21:57:23 GMT
[#6088] ticket:457 fixed template and links


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/95093100
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/95093100
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/95093100

Branch: refs/heads/cj/6714
Commit: 9509310065a32cf1b2c56e917d9e681799ad8747
Parents: 04277d5
Author: coldmind <sokandpal@yandex.ru>
Authored: Tue Oct 22 14:48:40 2013 +0300
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Thu Oct 24 20:22:58 2013 +0000

----------------------------------------------------------------------
 .../forgetracker/templates/tracker/bin.html     |  4 ++--
 .../templates/tracker/search_help.html          | 20 +++++++++-----------
 ForgeTracker/forgetracker/tracker_main.py       |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/95093100/ForgeTracker/forgetracker/templates/tracker/bin.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/bin.html b/ForgeTracker/forgetracker/templates/tracker/bin.html
index 5f83356..43dfc91 100644
--- a/ForgeTracker/forgetracker/templates/tracker/bin.html
+++ b/ForgeTracker/forgetracker/templates/tracker/bin.html
@@ -50,7 +50,7 @@
             <td class="edit" style="{% if not bin.error %}display:none{% else %}vertical-align:top{%
endif %}"><input type="text" name="bins-{{loop.index0}}.summary" value="{{bin.summary}}"></td>
             <td class="edit" {% if not bin.error %}style="display:none"{% endif %}>
                 <input class="grid-8" type="text" name="bins-{{loop.index0}}.terms" value="{{bin.terms}}">
-                <span class="grid-3"><a href="../../../tickets/search_help/" target="_blank"
class="btn search_help_modal"><b data-icon="{{g.icons['help'].char}}" class="ico {{g.icons['help'].css}}"></b>
Help</a></span>
+                <span class="grid-3"><a href="{{tg.url(c.project.url() + app.config.options.mount_point
+ '/search_help/')}}" target="_blank" class="btn search_help_modal"><b data-icon="{{g.icons['help'].char}}"
class="ico {{g.icons['help'].css}}"></b> Help</a></span>
                 {% if bin.error %}<br/><span style="color:red">{{bin.error}}</span>{%
endif %}
             </td>
             <td style="width:40px;">
@@ -70,7 +70,7 @@
           </td>
           <td>
             <input class="grid-8" type="text" name="bins-{{num_bins}}.terms" placeholder="Terms"
{% if new_bin %}value="{{new_bin.terms}}"{% endif %}>
-            <span class="grid-3"><a href="../../../tickets/search_help/" target="_blank"
class="btn search_help_modal"><b data-icon="{{g.icons['help'].char}}" class="ico {{g.icons['help'].css}}"></b>
Help</a></span>
+            <span class="grid-3"><a href="{{tg.url(c.project.url() + app.config.options.mount_point
+ '/search_help/')}}" target="_blank" class="btn search_help_modal"><b data-icon="{{g.icons['help'].char}}"
class="ico {{g.icons['help'].css}}"></b> Help</a></span>
             {% if new_bin and new_bin.error %}<br/><span class="err" style="color:red">{{new_bin.error}}</span>{%
endif %}
           </td>
           <td>&nbsp;</td>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/95093100/ForgeTracker/forgetracker/templates/tracker/search_help.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/search_help.html b/ForgeTracker/forgetracker/templates/tracker/search_help.html
index 851c190..c5e3f48 100644
--- a/ForgeTracker/forgetracker/templates/tracker/search_help.html
+++ b/ForgeTracker/forgetracker/templates/tracker/search_help.html
@@ -32,16 +32,6 @@
 
 {% block content%}
     <div><h1>Searching for tickets</h1>
-
-    <h3>{{c.project.name}} project custom fields:</h3>
-    <ul>
-    {% for field in globals.custom_fields or [] %}
-        {% if field.name != '_milestone' %}
-            <li>{{field.name}}</li>
-        {% endif %}
-    {% endfor %}
-    </ul>
-
     <p>Searches use <a href="http://www.solrtutorial.com/solr-query-syntax.html"
target="_blank">solr lucene query syntax</a>. Use the following fields in tracker
ticket searches:</p>
     <ul>
     <li>User who owns the ticket - assigned_to</li>
@@ -90,7 +80,15 @@
     <li>Status of the ticket - status_s</li>
     <li>Title of the ticket - snippet_s</li>
     <li>Private ticket - private_b</li>
-    <li>Custom field - the field name with an _ in front and _s at the end like _custom_s.
For Boolean custom fields use _b instead of _s. For Number custom fields use _i.</li>
+    <li>Custom fields:
+        <ul>
+        {% for field in c.app.globals.custom_fields or [] %}
+            {% if field.name != '_milestone' %}
+                <li>{{field.name}}</li>
+            {% endif %}
+        {% endfor %}
+        </ul>
+    </li>
     </ul>
     <p>You can use these properties by appending them to the url (only one sort allowed
at a time) like this:</p>
     <div class="codehilite"><pre>/p/yourproject/tickets/search/?q=_milestone:1.0&amp;sort=snippet_s+asc</pre></div></div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/95093100/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 46707e7..afb4079 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -765,7 +765,7 @@ class RootController(BaseController, FeedController):
     @expose('jinja:forgetracker:templates/tracker/search_help.html')
     def search_help(self):
         'Static page with search help'
-        return dict(globals=c.app.globals)
+        return dict()
 
 
     @with_trailing_slash


Mime
View raw message