You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/08/13 15:43:26 UTC
[6/9] allura git commit: [#7924] ticket:836 Update another bunch of
icons
[#7924] ticket:836 Update another bunch of icons
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/2f4f0595
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/2f4f0595
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/2f4f0595
Branch: refs/heads/ib/7924
Commit: 2f4f0595d1d3811f087bc09f3a9de32e07bccfe1
Parents: d0df87d
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Aug 13 15:48:41 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Thu Aug 13 15:48:41 2015 +0300
----------------------------------------------------------------------
Allura/allura/controllers/project.py | 2 +-
Allura/allura/ext/admin/admin_main.py | 2 +-
.../templates/admin_widgets/card_field.html | 9 ++-------
.../ext/admin/templates/project_groups.html | 15 +++------------
.../templates/sections/projects.html | 3 +--
Allura/allura/lib/app_globals.py | 20 ++++++++------------
Allura/allura/nf/allura/css/allura.css | 5 +++++
Allura/allura/public/nf/css/forge/deck.css | 2 +-
Allura/allura/templates/jinja_master/lib.html | 10 ++++++++--
.../forgeactivity/templates/macros.html | 5 ++++-
.../forgeactivity/templates/widgets/follow.html | 13 ++++++++-----
.../forgeshorturl/templates/index.html | 2 +-
ForgeTracker/forgetracker/tracker_main.py | 4 ++--
ForgeWiki/forgewiki/wiki_main.py | 2 +-
14 files changed, 46 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 4526e62..eee387a 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -169,7 +169,7 @@ class NeighborhoodController(object):
if h.has_access(self.neighborhood, 'register')() and (nb_max_projects is None or count < nb_max_projects):
c.custom_sidebar_menu += [
SitemapEntry('Add a Project', self.neighborhood.url()
- + 'add_project', ui_icon=g.icons['plus']),
+ + 'add_project', ui_icon=g.icons['add']),
SitemapEntry('')
]
c.custom_sidebar_menu = c.custom_sidebar_menu + [
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index ec61edb..370fb7b 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -134,7 +134,7 @@ class AdminApp(Application):
if c.project.is_nbhd_project:
links.append(SitemapEntry('Add Project', c.project.url()
- + 'add_project', ui_icon=g.icons['plus']))
+ + 'add_project', ui_icon=g.icons['add']))
nbhd_admin_url = c.project.neighborhood.url() + '_admin/'
links = links + [
SitemapEntry('Neighborhood'),
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/admin_widgets/card_field.html b/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
index e731290..47475fd 100644
--- a/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/card_field.html
@@ -28,10 +28,7 @@
class="ico-r admin_modal {{g.icons.perm_tool.css}}"></small>
</a>
{% endif %}
- <p style="padding-bottom: 0"><b
- data-icon="{{g.icons[icon_name].char}}"
- class="ico x48 {{g.icons[icon_name].css}}"></b>
- </p>
+ <p style="padding-bottom: 0">{{ g.icons[icon_name].render(tag='b', style='font-size:24px;') }}</p>
{% if desc %}
<p>{{ desc }}</p>
{% endif %}
@@ -61,9 +58,7 @@
<li>
<a href="#" class="adder">
Add
- <small data-icon="{{g.icons['plus'].char}}"
- class="ico-r {{g.icons['plus'].css}}"
- title="Add a user"></small>
+ {{ g.icons['add'].render(title="Add a user", tag="small") }}
</a>
</li>
<li>
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/Allura/allura/ext/admin/templates/project_groups.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/project_groups.html b/Allura/allura/ext/admin/templates/project_groups.html
index 54f7c26..57d37e2 100644
--- a/Allura/allura/ext/admin/templates/project_groups.html
+++ b/Allura/allura/ext/admin/templates/project_groups.html
@@ -38,10 +38,7 @@
</ul>
{% endmacro %}
{% macro group_icon(icon) %}
-<p style="padding-bottom: 0"><b
- data-icon="{{g.icons[icon].char}}"
- class="ico x48 {{g.icons[icon].css}}"></b>
-</p>
+<p style="padding-bottom: 0">{{ g.icons[icon].render(tag='b', style='font-size:24px;') }}</p>
{% endmacro %}
{% block content %}
@@ -87,9 +84,7 @@
</form>
</li>
<li class="adder">
- <b data-icon="{{g.icons['plus'].char}}"
- class="ico {{g.icons['plus'].css}}"></b>
- Add
+ {{ g.icons['add'].render(show_title=True) }}
</li>
</ul>
</td>
@@ -108,11 +103,7 @@
</tr>
<tr>
<td colspan="3" class="new_group">
- <a href="new" class="admin_modal" title="Add Group">
- <b data-icon="{{g.icons['plus'].char}}"
- class="ico x48 {{g.icons['plus'].css}}"></b>
- Add a new group
- </a>
+ {{ g.icons['add'].render(href="new", title="Add a new Group", show_title=True, extra_css='admin_modal') }}
</td>
</tr>
</tbody>
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/Allura/allura/ext/user_profile/templates/sections/projects.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/user_profile/templates/sections/projects.html b/Allura/allura/ext/user_profile/templates/sections/projects.html
index 9e1c632..246024c 100644
--- a/Allura/allura/ext/user_profile/templates/sections/projects.html
+++ b/Allura/allura/ext/user_profile/templates/sections/projects.html
@@ -57,8 +57,7 @@
{% if projects|length > 5 %}
<div class="show-more-projects">
<button onclick="$(this).hide().closest('.section-body').find('li.hidden').show()">
- Show More
- <b data-icon="{{g.icons['plus'].char}}" class="ico {{g.icons['plus'].css}}"></b>
+ {{ g.icons['add'].render(title='Show More', show_title=True, tag='b') }}
</button>
</div>
{% endif %}
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index e3507a3..bf83e71 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -247,16 +247,12 @@ class Globals(object):
folder=Icon('fa fa-folder', 'Folder'),
fork=Icon('fa fa-code-fork', 'Fork'),
merge=Icon('fa fa-code-fork', 'Merge'), # TODO: use something else here
- plus=Icon('fa fa-plus-circle', 'Add'),
conversation=Icon('fa fa-comments', 'Conversation'),
- group=Icon('g', 'ico-group'),
- user=Icon('U', 'ico-user'),
- secure=Icon('(', 'ico-lock'),
- unsecure=Icon(')', 'ico-unlock'),
- star=Icon('S', 'ico-star'),
- watch=Icon('E', 'ico-watch'),
- expand=Icon('`', 'ico-expand'),
- restore=Icon('J', 'ico-restore'),
+ group=Icon('fa fa-group', 'Group'),
+ user=Icon('fa fa-user', 'User'),
+ secure=Icon('fa fa-lock', 'Lock'),
+ unsecure=Icon('fa fa-unlock', 'Unlock'),
+ star=Icon('fa fa-star', 'Star'),
# Permissions
perm_read=Icon('E', 'ico-focus'),
perm_update=Icon('0', 'ico-sync'),
@@ -595,7 +591,7 @@ class Icon(object):
self.css = css
self.title = title or u''
- def render(self, show_title=False, extra_css=None, closing_tag=True, **kw):
+ def render(self, show_title=False, extra_css=None, closing_tag=True, tag='a', **kw):
title = kw.get('title') or self.title
attrs = {
'href': '#',
@@ -607,6 +603,6 @@ class Icon(object):
visible_title = u''
if show_title:
visible_title = u'<span> {}</span>'.format(Markup.escape(title))
- closing_tag = u'</a>' if closing_tag else u''
- icon = u'<a {}>{}{}'.format(attrs, visible_title, closing_tag)
+ closing_tag = u'</{}>'.format(tag) if closing_tag else u''
+ icon = u'<{} {}>{}{}'.format(tag, attrs, visible_title, closing_tag)
return Markup(icon)
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/Allura/allura/nf/allura/css/allura.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/allura.css b/Allura/allura/nf/allura/css/allura.css
index a919224..a6425db 100644
--- a/Allura/allura/nf/allura/css/allura.css
+++ b/Allura/allura/nf/allura/css/allura.css
@@ -98,3 +98,8 @@ tr.rev div.markdown_content p {
#phone_verification_overlay iframe {
height: 320px;
}
+
+#usergroup_admin td.group {
+ text-align: center;
+ line-height: 3em;
+}
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/Allura/allura/public/nf/css/forge/deck.css
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/css/forge/deck.css b/Allura/allura/public/nf/css/forge/deck.css
index 35a6b37..7bc7486 100644
--- a/Allura/allura/public/nf/css/forge/deck.css
+++ b/Allura/allura/public/nf/css/forge/deck.css
@@ -76,7 +76,7 @@ ul.deck li small {
position: absolute;
right: 5px;
text-align: center;
- top: 4px;
+ top: 6px;
width: 26px;
}
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index 75acb9e..83ea02e 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -60,7 +60,10 @@
title="{{display_name}}"
class="emboss{% if size %} x{{size}}{% endif %}{% if className %} {{className}}{% endif %}">
{% else %}
- <b data-icon="{{g.icons['user'].char}}" class="ico emboss {{g.icons['user'].css}}{% if size %} x{{size}}{% endif %}{% if className %} {{className}}{% endif %}"></b>
+ {{ g.icons['user'].render(
+ tag='b',
+ style='font-size:{}px;'.format(size) if size else '',
+ extra_css='emboss {}'.format(className or '')) }}
{% endif %}
{%- endmacro %}
@@ -78,7 +81,10 @@
title="{{title or email}}"
class="emboss {% if size %} x{{size}}{% endif %}">
{% else %}
- <b data-icon="{{g.icons['user'].char}}" class="ico emboss {{g.icons['user'].css}}{% if size %} x{{size}}{% endif %}"></b>
+ {{ g.icons['user'].render(
+ tag='b',
+ style='font-size:{}px;'.format(size) if size else '',
+ extra_css='emboss') }}
{% endif %}
{%- endmacro %}
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/ForgeActivity/forgeactivity/templates/macros.html
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/templates/macros.html b/ForgeActivity/forgeactivity/templates/macros.html
index f3bac05..86897d7 100644
--- a/ForgeActivity/forgeactivity/templates/macros.html
+++ b/ForgeActivity/forgeactivity/templates/macros.html
@@ -32,6 +32,9 @@
title="{{ o.activity_name }}"
class="emboss{% if size %} x{{size}}{% endif %}{% if className %} {{className}}{% endif %}">
{% else %}
- <b data-icon="{{g.icons['user'].char}}" class="ico emboss {{g.icons['user'].css}}{% if size %} x{{size}}{% endif %}{% if className %} {{className}}{% endif %}"></b>
+ {{ g.icons['user'].render(
+ tag='b',
+ style='font-size:{}px;'.format(size) if size else '',
+ extra_css='emboss {}'.format(className or '')) }}
{% endif %}
{%- endmacro %}
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/ForgeActivity/forgeactivity/templates/widgets/follow.html
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/templates/widgets/follow.html b/ForgeActivity/forgeactivity/templates/widgets/follow.html
index 34387e2..8fd8ea8 100644
--- a/ForgeActivity/forgeactivity/templates/widgets/follow.html
+++ b/ForgeActivity/forgeactivity/templates/widgets/follow.html
@@ -17,8 +17,11 @@
under the License.
-#}
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
-<a href="{{action}}" data-following="{{following|lower}}" data-csrf="{{lib.csrf()}}"
- class="artifact_follow{{ ' active' if following }}"
- title="{{'Stop %sing' % action_label if following else action_label|capitalize}} {{thing}}"><b
- data-icon="{{g.icons[icon].char}}" class="ico {{g.icons[icon].css}}"
- title="{{'Stop %sing' % action_label if following else action_label|capitalize}} {{thing}}"></b></a>
+{{ g.icons[icon].render(
+ href=action,
+ extra_css='artifact_follow{}'.format(' active' if following else ''),
+ title='{} {}'.format(
+ 'Stop {}ing'.format(action_label) if following else action_label.capitalize(),
+ thing),
+ **{'data-following': h.really_unicode(following).lower(),
+ 'data-csrf': lib.csrf()}) }}
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/ForgeShortUrl/forgeshorturl/templates/index.html
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/templates/index.html b/ForgeShortUrl/forgeshorturl/templates/index.html
index 178345b..8f51bf1 100644
--- a/ForgeShortUrl/forgeshorturl/templates/index.html
+++ b/ForgeShortUrl/forgeshorturl/templates/index.html
@@ -23,7 +23,7 @@
{% block actions %}
{% if can_create %}
- {{ g.icons['plus'].render(
+ {{ g.icons['add'].render(
href='{}admin/{}/add/'.format(c.project.url(), c.app.config.options.mount_point),
title="Add Short URL",
extra_css="add-short-url") }}
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 8498275..eeab6f0 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -340,14 +340,14 @@ class ForgeTrackerApp(Application):
links = []
if has_access(self, 'create')():
links.append(SitemapEntry('Create Ticket',
- self.config.url() + 'new/', ui_icon=g.icons['plus']))
+ self.config.url() + 'new/', ui_icon=g.icons['add']))
else:
extra_attrs = {"title": "To create a new ticket, you must be authorized by the project admin."}
links.append(SitemapEntry('Create Ticket',
self.config.url() + 'new/',
extra_html_attrs=extra_attrs,
className='sidebar-disabled',
- ui_icon=g.icons['plus']))
+ ui_icon=g.icons['add']))
if has_access(self, 'configure')():
links.append(SitemapEntry('Edit Milestones', self.config.url()
+ 'milestones', ui_icon=g.icons['table']))
http://git-wip-us.apache.org/repos/asf/allura/blob/2f4f0595/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 63de953..afe410e 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -225,7 +225,7 @@ The wiki uses [Markdown](%s) syntax.
links = []
if has_create_access:
links += [SitemapEntry('Create Page', create_page_url,
- ui_icon=g.icons['plus'],
+ ui_icon=g.icons['add'],
className=create_page_class)]
if not admin_menu:
links += [SitemapEntry(''),