Commit: ddd3892eda49c6d2fa4fc39c29c767f26a50f3d5 - allura (git)

allura

Commit MetaInfo

• Revision: ddd3892eda49c6d2fa4fc39c29c767f26a50f3d5 (tree)
• Zeit: 2012-04-19 03:08:54
• Autor: Dave Brondsema <dbrondsema@geek...>
• Commiter: Jenny Steele

Log Message

[#4063] remove all useless className='nav_child' (from an old theme)

Ändern Zusammenfassung

• modified: Allura/allura/app.py
• modified: Allura/allura/controllers/project.py
• modified: Allura/allura/controllers/root.py
• modified: Allura/allura/controllers/search.py
• modified: Allura/allura/ext/admin/admin_main.py
• modified: Allura/allura/lib/repository.py
• modified: Allura/allura/tests/functional/test_root.py
• modified: ForgeDiscussion/forgediscussion/forum_main.py
• modified: ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
• modified: ForgeTracker/forgetracker/tracker_main.py
• modified: ForgeWiki/forgewiki/wiki_main.py

Diff

--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -241,7 +241,7 @@ class Application(object):
         admin_url = c.project.url()+'admin/'+self.config.options.mount_point+'/'
         links = []
         if self.permissions and has_access(c.project, 'admin')():
-            links.append(SitemapEntry('Permissions', admin_url + 'permissions', className='nav_child'))
+            links.append(SitemapEntry('Permissions', admin_url + 'permissions'))
         if force_options or len(self.config_options) > 3:
             links.append(SitemapEntry('Options', admin_url + 'options', className='admin_modal'))
         links.append(SitemapEntry('Label', admin_url + 'edit_label', className='admin_modal'))

--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -112,7 +112,7 @@ class NeighborhoodController(object):
                 SitemapEntry('')
             ]
         c.custom_sidebar_menu = c.custom_sidebar_menu + [
-            SitemapEntry(cat.label, self.neighborhood.url()+'browse/'+cat.name, className='nav_child') for cat in categories
+            SitemapEntry(cat.label, self.neighborhood.url()+'browse/'+cat.name) for cat in categories
         ]
         return dict(neighborhood=self.neighborhood,
                     title="Welcome to "+self.neighborhood.name,
@@ -393,8 +393,8 @@ def set_nav(neighborhood):
     else:
         admin_url = neighborhood.url() + '_admin/'
         c.custom_sidebar_menu = [
-            SitemapEntry('Overview', admin_url + 'overview', className='nav_child'),
-            SitemapEntry('Awards', admin_url + 'accolades', className='nav_child')]
+            SitemapEntry('Overview', admin_url + 'overview'),
+            SitemapEntry('Awards', admin_url + 'accolades')]
 
 class NeighborhoodAdminController(object):
     def __init__(self, neighborhood):

--- a/Allura/allura/controllers/root.py
+++ b/Allura/allura/controllers/root.py
@@ -90,7 +90,7 @@ class RootController(WsgiDispatchController):
                   for n in neighborhoods ]
         categories = M.ProjectCategory.query.find({'parent_id':None}).sort('name').all()
         c.custom_sidebar_menu = [
-            SitemapEntry(cat.label, '/browse/'+cat.name, className='nav_child') for cat in categories
+            SitemapEntry(cat.label, '/browse/'+cat.name) for cat in categories
         ]
         return dict(projects=psort,title="All Projects",text=None)
 

--- a/Allura/allura/controllers/search.py
+++ b/Allura/allura/controllers/search.py
@@ -61,14 +61,14 @@ class ProjectBrowseController(BaseController):
             nav.append(SitemapEntry(
                 cat.label,
                 self.nav_stub+cat.name,
-                className='nav_child'))
+                ))
             if (self.category and self.category._id == cat._id and cat.subcategories) or (
                 self.parent_category and self.parent_category._id == cat._id):
                 for subcat in cat.subcategories:
                     nav.append(SitemapEntry(
                         subcat.label,
                         self.nav_stub+cat.name+'/'+subcat.name,
-                        className='nav_child2'))
+                        ))
         return nav
 
     def _find_projects(self,sort='alpha', limit=None, start=0):

--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -121,25 +121,25 @@ class AdminApp(Application):
             nbhd_admin_url = c.project.neighborhood.url()+'_admin/'
             links = links + [
                      SitemapEntry('Neighborhood'),
-                     SitemapEntry('Overview', nbhd_admin_url+'overview', className='nav_child'),
-                     SitemapEntry('Awards', nbhd_admin_url+'accolades', className='nav_child')]
+                     SitemapEntry('Overview', nbhd_admin_url+'overview'),
+                     SitemapEntry('Awards', nbhd_admin_url+'accolades')]
         else:
             links += [
-                SitemapEntry('Metadata', admin_url+'overview', className='nav_child'),
-                SitemapEntry('Screenshots', admin_url+'screenshots', className='nav_child'),
-                SitemapEntry('Categorization', admin_url+'trove', className='nav_child')
+                SitemapEntry('Metadata', admin_url+'overview'),
+                SitemapEntry('Screenshots', admin_url+'screenshots'),
+                SitemapEntry('Categorization', admin_url+'trove')
                 ]
         if has_access(c.project, 'admin')():
-            links.append(SitemapEntry('Permissions', admin_url+'permissions/', className='nav_child'))
-        links.append(SitemapEntry('Tools', admin_url+'tools', className='nav_child'))
+            links.append(SitemapEntry('Permissions', admin_url+'permissions/'))
+        links.append(SitemapEntry('Tools', admin_url+'tools'))
         if c.project.is_root and has_access(c.project, 'admin')():
-            links.append(SitemapEntry('Usergroups', admin_url+'groups/', className='nav_child'))
+            links.append(SitemapEntry('Usergroups', admin_url+'groups/'))
         if len(c.project.neighborhood_invitations):
             links.append(SitemapEntry('Invitation(s)', admin_url+'invitations'))
         links.append(SitemapEntry('Audit Trail', admin_url+ 'audit/'))
         if c.project.shortname == '--init--':
             links.append(None)
-            links.append(SitemapEntry('Help', nbhd_admin_url+ 'help/', className='nav_child'))
+            links.append(SitemapEntry('Help', nbhd_admin_url+ 'help/'))
         return links
 
     def admin_menu(self):

--- a/Allura/allura/lib/repository.py
+++ b/Allura/allura/lib/repository.py
@@ -71,7 +71,7 @@ class RepositoryApp(Application):
         links = [SitemapEntry('Viewable Files', admin_url + 'extensions', className='admin_modal')]
         links.append(SitemapEntry('Refresh Repository',
                                   c.project.url() + self.config.options.mount_point + '/refresh',
-                                  className='nav_child'))
+                                  ))
         links += super(RepositoryApp, self).admin_menu()
         [links.remove(l) for l in links[:] if l.label == 'Options']
         return links
@@ -96,7 +96,6 @@ class RepositoryApp(Application):
             links += [
                 SitemapEntry(
                     'Merge Requests', c.app.url + 'merge-requests/',
-                    className='nav_child',
                     small=merge_request_count) ]
         if self.repo.upstream_repo.name:
             repo_path_parts = self.repo.upstream_repo.name.strip('/').split('/')
@@ -104,26 +103,23 @@ class RepositoryApp(Application):
                 SitemapEntry('Clone of'),
                 SitemapEntry('%s / <strong>%s</strong>' %
                     (repo_path_parts[1], repo_path_parts[-1]),
-                    self.repo.upstream_repo.name,
-                    className='nav_child')
+                    self.repo.upstream_repo.name)
                 ]
             if len(c.app.repo.branches) and has_access(c.app.repo, 'admin'):
                 links.append(SitemapEntry('Request Merge', c.app.url + 'request_merge',
                              ui_icon=g.icons['merge'],
-                             className='nav_child'))
+                             ))
             pending_upstream_merges = self.repo.pending_upstream_merges()
             if pending_upstream_merges:
                 links.append(SitemapEntry(
                         'Pending Merges',
                         self.repo.upstream_repo.name + 'merge-requests/',
-                        className='nav_child',
                         small=pending_upstream_merges))
         if self.repo.branches:
             links.append(SitemapEntry('Branches'))
             for b in self.repo.branches:
                 links.append(SitemapEntry(
                         b.name, url(c.app.url, dict(branch='ref/' + b.name)),
-                        className='nav_child',
                         small=b.count))
         if self.repo.repo_tags:
             links.append(SitemapEntry('Tags'))
@@ -132,14 +128,13 @@ class RepositoryApp(Application):
                 if i < max_tags:
                     links.append(SitemapEntry(
                             b.name, url(c.app.url, dict(branch='ref/' + b.name)),
-                            className='nav_child',
                             small=b.count))
                 elif i == max_tags:
                     links.append(
                         SitemapEntry(
                             'More Tags',
                             default_branch_url+'tags/',
-                            className='nav_child'))
+                            ))
                     break
         if self.repo.forks:
             links.append(SitemapEntry('Forks'))
@@ -148,7 +143,7 @@ class RepositoryApp(Application):
                 links.append(SitemapEntry(
                     '%s / <strong>%s</strong>' %
                     (repo_path_parts[1], repo_path_parts[-1]),
-                    f.url(), className='nav_child'))
+                    f.url()))
         return links
 
     def install(self, project):

--- a/Allura/allura/tests/functional/test_root.py
+++ b/Allura/allura/tests/functional/test_root.py
@@ -37,7 +37,6 @@ class TestRootController(TestController):
         cat_links = response.html.find('div',{'id':'sidebar'}).findAll('li')
         assert len(cat_links) == 4
         assert cat_links[0].find('a').get('href') == '/browse/clustering'
-        assert cat_links[0].find('a').get('class') == 'nav_child'
         assert cat_links[0].find('a').find('span').string == 'Clustering'
 
     def test_strange_accept_headers(self):
@@ -70,7 +69,6 @@ class TestRootController(TestController):
         cat_links = response.html.find('div',{'id':'sidebar'}).findAll('ul')[1].findAll('li')
         assert len(cat_links) == 3, cat_links
         assert cat_links[0].find('a').get('href') == '/adobe/browse/clustering'
-        assert cat_links[0].find('a').get('class') == 'nav_child'
         assert cat_links[0].find('a').find('span').string == 'Clustering'
 
     def test_neighborhood_project_browse(self):

--- a/ForgeDiscussion/forgediscussion/forum_main.py
+++ b/ForgeDiscussion/forgediscussion/forum_main.py
@@ -130,7 +130,7 @@ class ForgeDiscussionApp(Application):
                     if f.url() in request.url and h.has_access(f, 'moderate')():
                         moderate_link = SitemapEntry('Moderate', "%smoderate/" % f.url(), ui_icon=g.icons['pencil'],
                         small = DM.ForumPost.query.find({'discussion_id':f._id, 'status':{'$ne': 'ok'}}).count())
-                    forum_links.append(SitemapEntry(f.name, f.url(), className='nav_child', small=f.num_topics))
+                    forum_links.append(SitemapEntry(f.name, f.url(), small=f.num_topics))
             l.append(SitemapEntry('Create Topic', c.app.url + 'create_topic', ui_icon=g.icons['plus']))
             if has_access(c.app, 'configure')():
                 l.append(SitemapEntry('Add Forum', c.app.url + 'new_forum', ui_icon=g.icons['conversation']))
@@ -146,7 +146,7 @@ class ForgeDiscussionApp(Application):
                 l.append(SitemapEntry('Forums'))
                 l = l + forum_links
             l.append(SitemapEntry('Help'))
-            l.append(SitemapEntry('Formatting Help', c.app.url + 'markdown_syntax', className='nav_child'))
+            l.append(SitemapEntry('Formatting Help', c.app.url + 'markdown_syntax'))
             return l
         except: # pragma no cover
             log.exception('sidebar_menu')

--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -636,7 +636,7 @@ class TestForum(TestController):
         assert '<a href="/p/test/discussion/create_topic"><b data-icon="+" class="ico ico-plus"></b> <span>Create Topic</span></a>' in sidebarmenu
         assert '<a href="/p/test/discussion/new_forum"><b data-icon="q" class="ico ico-conversation"></b> <span>Add Forum</span></a>' in sidebarmenu
         assert '<h3 class="">Help</h3>' in sidebarmenu
-        assert '<a href="/p/test/discussion/markdown_syntax" class="nav_child"><span>Formatting Help</span></a>' in sidebarmenu
+        assert '<a href="/p/test/discussion/markdown_syntax"><span>Formatting Help</span></a>' in sidebarmenu
         assert '<a href="flag_as_spam" class="sidebar_thread_spam"><b data-icon="^" class="ico ico-flag"></b> <span>Mark as Spam</span></a>' not in sidebarmenu
         r = self.app.get('/discussion/create_topic/')
         f = r.html.find('form',{'action':'/p/test/discussion/save_new_topic'})
@@ -658,7 +658,7 @@ class TestForum(TestController):
         assert '<a href="/p/test/discussion/create_topic"><b data-icon="+" class="ico ico-plus"></b> <span>Create Topic</span></a>' in sidebarmenu
         assert '<a href="/p/test/discussion/new_forum"><b data-icon="q" class="ico ico-conversation"></b> <span>Add Forum</span></a>' in sidebarmenu
         assert '<h3 class="">Help</h3>' in sidebarmenu
-        assert '<a href="/p/test/discussion/markdown_syntax" class="nav_child"><span>Formatting Help</span></a>' in sidebarmenu
+        assert '<a href="/p/test/discussion/markdown_syntax"><span>Formatting Help</span></a>' in sidebarmenu
         assert '<a href="flag_as_spam" class="sidebar_thread_spam"><b data-icon="^" class="ico ico-flag"></b> <span>Mark as Spam</span></a>' not in sidebarmenu
         r = self.app.get('/discussion/create_topic/')
         f = r.html.find('form',{'action':'/p/test/discussion/save_new_topic'})

--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -163,9 +163,6 @@ class ForgeTrackerApp(Application):
         links = [SitemapEntry('Field Management', admin_url + 'fields'),
                  SitemapEntry('Edit Searches', admin_url + 'bins/')]
         links += super(ForgeTrackerApp, self).admin_menu()
-        # make the options link non-modal
-        options_link = [l for l in links if l.label == 'Options'][0]
-        options_link.className = 'nav_child'
         return links
 
     @h.exceptionless([], log)
@@ -176,7 +173,7 @@ class ForgeTrackerApp(Application):
         for bin in self.bins:
             label = bin.shorthand_id()
             search_bins.append(SitemapEntry(
-                    h.text.truncate(label, 72), bin.url(), className='nav_child search_bin'))
+                    h.text.truncate(label, 72), bin.url(), className='search_bin'))
         for fld in c.app.globals.milestone_fields:
             milestones.append(SitemapEntry(h.text.truncate(fld.label, 72)))
             for m in getattr(fld, "milestones", []):
@@ -185,7 +182,6 @@ class ForgeTrackerApp(Application):
                     SitemapEntry(
                         h.text.truncate(m.name, 72),
                         self.url + fld.name[1:] + '/' + h.urlquote(m.name) + '/',
-                        className='nav_child',
                         small=c.app.globals.milestone_count('%s:%s' % (fld.name, m.name))['hits']))
         if ticket.isdigit():
             ticket = TM.Ticket.query.find(dict(app_config_id=self.config._id,ticket_num=int(ticket))).first()
@@ -209,13 +205,13 @@ class ForgeTrackerApp(Application):
             if ticket.super_id:
                 links.append(SitemapEntry('Supertask'))
                 super = TM.Ticket.query.get(_id=ticket.super_id, app_config_id=c.app.config._id)
-                links.append(SitemapEntry('[#{0}]'.format(super.ticket_num), super.url(), className='nav_child'))
+                links.append(SitemapEntry('[#{0}]'.format(super.ticket_num), super.url()))
             if ticket.sub_ids:
                 links.append(SitemapEntry('Subtasks'))
             for sub_id in ticket.sub_ids or []:
                 sub = TM.Ticket.query.get(_id=sub_id, app_config_id=c.app.config._id)
-                links.append(SitemapEntry('[#{0}]'.format(sub.ticket_num), sub.url(), className='nav_child'))
-            #links.append(SitemapEntry('Create New Subtask', '{0}new/?super_id={1}'.format(self.config.url(), ticket._id), className='nav_child'))
+                links.append(SitemapEntry('[#{0}]'.format(sub.ticket_num), sub.url()))
+            #links.append(SitemapEntry('Create New Subtask', '{0}new/?super_id={1}'.format(self.config.url(), ticket._id)))
 
         links += milestones
 
@@ -223,7 +219,7 @@ class ForgeTrackerApp(Application):
             links.append(SitemapEntry('Searches'))
             links = links + search_bins
         links.append(SitemapEntry('Help'))
-        links.append(SitemapEntry('Formatting Help', self.config.url() + 'markdown_syntax', className='nav_child'))
+        links.append(SitemapEntry('Formatting Help', self.config.url() + 'markdown_syntax'))
         return links
 
     def sidebar_menu_js(self):

--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -175,7 +175,7 @@ class ForgeWikiApp(Application):
             links.append(SitemapEntry('Moderate', discussion.url() + 'moderate', ui_icon=g.icons['pencil'],
                 small = pending_mod_count))
         links += [SitemapEntry(''),
-            SitemapEntry('Formatting Help',c.app.url+'markdown_syntax/', className='nav_child')
+            SitemapEntry('Formatting Help',c.app.url+'markdown_syntax/')
         ]
         return links