Commit: 2e4e6411f3a9e97dda6006e4f84a1ede24eac8d5 - allura (git)

allura

Commit MetaInfo

• Revisão: 2e4e6411f3a9e97dda6006e4f84a1ede24eac8d5 (tree)
• Hora: 2012-06-27 01:46:44
• Autor: Jenny Steele <jsteele@geek...>
• Commiter: Dave Brondsema

Mensagem de Log

[#4180] Added ability for a neighborhood to make a custom link for their nav and added text to make the neighborhood home link more obvious

Mudança Sumário

• modified: Allura/allura/controllers/project.py
• modified: Allura/allura/lib/widgets/forms.py
• modified: Allura/allura/model/neighborhood.py
• modified: Allura/allura/templates/jinja_master/master.html
• modified: Allura/allura/templates/jinja_master/nav_menu.html
• modified: Allura/allura/templates/jinja_master/neigh_nav_menu.html
• modified: Allura/allura/templates/widgets/neighborhood_overview_form.html

Diff

--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -475,6 +475,7 @@ class NeighborhoodAdminController(object):
         self.neighborhood.project_template = project_template
         self.neighborhood.allow_browse = kw.get('allow_browse', False)
         self.neighborhood.show_title = kw.get('show_title', False)
+        self.neighborhood.project_list_url = kw.get('project_list_url', '')
         tracking_id = kw.get('tracking_id', '')
         if tracking_id != self.neighborhood.tracking_id:
             c.project = self.neighborhood.neighborhood_project

--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -140,6 +140,7 @@ class NeighborhoodOverviewForm(ForgeForm):
                 validator=V.JsonValidator(if_empty=''))
         icon = ew.FileField()
         tracking_id = ew.TextField()
+        project_list_url = ew.TextField(validator=fev.URL())
 
     def from_python(self, value, state):
         if value.features['css'] == "picker":

--- a/Allura/allura/model/neighborhood.py
+++ b/Allura/allura/model/neighborhood.py
@@ -55,6 +55,7 @@ class Neighborhood(MappedClass):
     site_specific_html = FieldProperty(str, if_missing='')
     project_template = FieldProperty(str, if_missing='')
     tracking_id = FieldProperty(str, if_missing='')
+    project_list_url = FieldProperty(str, if_missing='')
     level = FieldProperty(S.Deprecated)
     allow_private = FieldProperty(S.Deprecated)
     features = FieldProperty(dict(

--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -59,7 +59,7 @@
     {{theme_macros.header(c.user.username, c.user._id, c.user.display_name, g.login_url, '/auth/logout')}}
     {% set flash = tg.flash_obj.render('flash', use_js=False) %}
     <section id="page-body" class="{{g.document_class(neighborhood)}}">
-	  <div class="grid-24">
+	  <div class="grid-24" id="nav_menu_holder">
             {% block nav_menu %}
             {% include g.theme.nav_menu %}
             {% endblock %}

--- a/Allura/allura/templates/jinja_master/nav_menu.html
+++ b/Allura/allura/templates/jinja_master/nav_menu.html
@@ -5,7 +5,17 @@
 {% else %}
   {% if c.project.neighborhood.icon %}
     <a href="{{c.project.neighborhood.url()}}"><img src="{{c.project.neighborhood.url()}}/icon" class="neighborhood_icon"
-       alt="Return to {{c.project.neighborhood.name}} Neighborhood" title="Return to {{c.project.neighborhood.name}} Neighborhood"></a>
+       alt="Return to {{c.project.neighborhood.name}}" title="Return to {{c.project.neighborhood.name}}"></a>
+       <div class="neighborhood_title">
+         <h1><a href="{{c.project.neighborhood.url()}}">{{c.project.neighborhood.name}}</a></h1>
+         {% if c.project.neighborhood.project_list_url %}
+           <div class="neighborhood_title_link">
+           <a href="{{c.project.neighborhood.project_list_url}}">
+             View More Projects
+           </a>
+           </div>
+         {% endif %}
+      </div>
   {% endif %}
   <a href="{{c.project.url()}}">
     {% if c.project.user_project_of %}

--- a/Allura/allura/templates/jinja_master/neigh_nav_menu.html
+++ b/Allura/allura/templates/jinja_master/neigh_nav_menu.html
@@ -1,11 +1,15 @@
 {% if not neighborhood or not neighborhood.show_title %}
   <div id="nav_menu_missing"></div>
 {% else %}
-
-  <a href="{{neighborhood.url()}}">
     {% if neighborhood.icon %}
-      <img src="{{neighborhood.url()}}/icon" class="project_icon" alt="{{neighborhood.name}} Logo"/>
+      <a href="{{neighborhood.url()}}"><img src="{{neighborhood.url()}}/icon" class="project_icon" alt="{{neighborhood.name}} Logo"/></a>
     {% endif %}
-	<h1 class="project_title">{{neighborhood.name}}</h1>
-	</a>
+	<h1 class="project_title"><a href="{{neighborhood.url()}}">{{neighborhood.name}}</a></h1>
+  {% if neighborhood.project_list_url %}
+    <div class="project_title_link">
+    <a href="{{neighborhood.project_list_url}}">
+      View Projects
+    </a>
+    </div>
+  {% endif %}
 {% endif %}

--- a/Allura/allura/templates/widgets/neighborhood_overview_form.html
+++ b/Allura/allura/templates/widgets/neighborhood_overview_form.html
@@ -28,6 +28,8 @@
     <label class="grid-4">Analytics Tracking ID</label>
     <div class="grid-14">{{widget.display_field(widget.fields.tracking_id)}}</div>
     {% endif %}
+    <label class="grid-4">Project List URL</label>
+    <div class="grid-14">{{widget.display_field(widget.fields.project_list_url)}}</div>
     <label class="grid-4">&nbsp;</label>
     <div class="grid-14"><input type="submit" value="Save"/></div>
   </form>