Commits

Adrian Dries committed 9aafac3

setting up for simplified repository and branch management

Comments (0)

Files changed (4)

 
     def configure(self):
         config = self.config
-        self.display_version_tag = config.get('version_tag_display', True)
         t = self.version_tag = config.get('version_tag')
         v = self.version_number = self.get_version()
         self.version = t and '%s-%s' % (t, v) or str(v)
             action='store',
             metavar='FILE.ini',
             dest='config_file',
-            default = op.join('config.ini')
+            default = factory.config_file
         )
         p.add_option(
             '-h', '--help',

fenton/templates/fenton_core.mako

           <td id=header-logo>
             ${this.logo_html | n}
           </td>
-          <td id=header-version>
-            % if this.version_tag:
-                <b style=color:red>${this.version_tag}</b>
-            % endif
-            % if this.version_number:
-                [${this.version_number}]
-            % endif
-          </td>
           <td id=header-crumbs>
             % for link in this.screen_trail:
                 <span class=crumb>
             % endif
           </td>
           <td id=header-session>
-            % for i, link in enumerate(this.session_links):
-                ${ i and '|' or '' }
-                <% self.render_widget(link) %>
+            % if this.version_number:
+                <span class=version-number>v${this.version_number}</span>
+            % endif
+            % if this.version_tag:
+                <span class=version-tag>${this.version_tag}</span>
+            % endif
+            % for link in this.session_links:
+                | <% self.render_widget(link) %>
             % endfor
           </td>
         </tr>

fenton/widgets.py

 
     @property
     def version_tag(self):
-        return self.app.display_version_tag and self.app.version_tag or ''
+        return self.app.version_tag or ''
 
     @property
     def version_number(self):