mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-22 04:28:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

In detail view, 'More in category' now has higher precedence than 'More by developer'

Browse Source
This commit is contained in:
Greg Neagle
2014-03-25 10:56:07 -07:00
parent 77785f589a
commit 626dca37d1
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/Managed Software Center/Managed Software Center/msuhtml.py
+21 -20
View File
@@ -60,6 +60,26 @@ def build_detail_page(item_name):
if item['name'] == item_name:
page = MunkiItems.OptionalItem(item)
msulib.addSidebarLabels(page)
# make "More in CategoryFoo" list
page['hide_more_in_category'] = u'hidden'
more_in_category_html = u''
more_in_category = []
if item.get('category'):
category = item['category']
page['category_link'] = u'category-%s.html' % quote_plus(category)
more_in_category = [a for a in items
if a.get('category') == category
and a != item
and a.get('status') != 'installed']
if more_in_category:
page['hide_more_in_category'] = u''
page['moreInCategoryLabel'] = page['moreInCategoryLabel'] % page['category']
shuffle(more_in_category)
more_template = msulib.get_template('detail_more_items_template.html')
for more_item in more_in_category[:4]:
more_item['second_line'] = more_item.get('developer', '')
more_in_category_html += more_template.safe_substitute(more_item)
page['more_in_category'] = more_in_category_html
# make "More by DeveloperFoo" list
page['hide_more_by_developer'] = u'hidden'
more_by_developer_html = u''
@@ -71,6 +91,7 @@ def build_detail_page(item_name):
more_by_developer = [a for a in items
if a.get('developer') == developer
and a != item
and a not in more_in_category
and a.get('status') != 'installed']
if more_by_developer:
page['hide_more_by_developer'] = u''
@@ -83,26 +104,6 @@ def build_detail_page(item_name):
more_item['second_line'] = more_item.get('category', '')
more_by_developer_html += more_template.safe_substitute(more_item)
page['more_by_developer'] = more_by_developer_html
# make "More by CategoryFoo" list
page['hide_more_in_category'] = u'hidden'
more_in_category_html = u''
if item.get('category'):
category = item['category']
page['category_link'] = u'category-%s.html' % quote_plus(category)
more_in_category = [a for a in items
if a.get('category') == category
and a != item
and a not in more_by_developer
and a.get('status') != 'installed']
if more_in_category:
page['hide_more_in_category'] = u''
page['moreInCategoryLabel'] = page['moreInCategoryLabel'] % page['category']
shuffle(more_in_category)
more_template = msulib.get_template('detail_more_items_template.html')
for more_item in more_in_category[:4]:
more_item['second_line'] = more_item.get('developer', '')
more_in_category_html += more_template.safe_substitute(more_item)
page['more_in_category'] = more_in_category_html
page['footer'] = msulib.getFooter()
template = msulib.get_template('detail_template.html')
code/Managed Software Center/Managed Software Center/templates/detail_template.html
+7 -7
View File
@@ -78,13 +78,6 @@
</ul>
</div>
</div>
<!-- More by developer sidebar list-->
<div class="titled-box more-by ${hide_more_by_developer}">
<h2>
<a href="${developer_link}">${moreByDeveloperLabel}</a>
</h2>
<div class="content">${more_by_developer}</div>
</div>
<!-- More in category sidebar list-->
<div class="titled-box more-by ${hide_more_in_category}">
<h2>
@@ -92,6 +85,13 @@
</h2>
<div class="content">${more_in_category}</div>
</div>
<!-- More by developer sidebar list-->
<div class="titled-box more-by ${hide_more_by_developer}">
<h2>
<a href="${developer_link}">${moreByDeveloperLabel}</a>
</h2>
<div class="content">${more_by_developer}</div>
</div>
</div>
</div>
</div>