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/10/19 13:38:07 UTC
[42/50] [abbrv] allura git commit: [#7924] ticket:830 Update another
bunch of icons
[#7924] ticket:830 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/dc1a8a59
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/dc1a8a59
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/dc1a8a59
Branch: refs/heads/ib/7924
Commit: dc1a8a59a075f0ebbb7e9948113e1e9c251b677b
Parents: aee6e44
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Aug 11 19:01:29 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Thu Oct 15 15:07:30 2015 +0000
----------------------------------------------------------------------
.../ext/user_profile/templates/user_index.html | 10 ++++++----
Allura/allura/lib/app_globals.py | 16 ++++++++--------
Allura/allura/nf/allura/css/allura.css | 11 +++++++++--
.../allura/templates/app_admin_webhooks_list.html | 11 +++++------
Allura/allura/templates/repo/diff.html | 2 +-
Allura/allura/templates/repo/file.html | 2 +-
Allura/allura/templates/widgets/flag_post.html | 2 +-
Allura/allura/templates/widgets/lightbox.html | 2 +-
Allura/allura/templates/widgets/markdown_edit.html | 2 +-
Allura/allura/templates/widgets/post_widget.html | 7 +++++--
Allura/allura/templates/widgets/threads_table.html | 4 ++--
.../templates/tracker_widgets/ticket_form.html | 2 +-
.../forgewiki/templates/wiki/page_history.html | 6 ++++--
13 files changed, 45 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/Allura/allura/ext/user_profile/templates/user_index.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/user_profile/templates/user_index.html b/Allura/allura/ext/user_profile/templates/user_index.html
index 19cf1c1..5232a5a 100644
--- a/Allura/allura/ext/user_profile/templates/user_index.html
+++ b/Allura/allura/ext/user_profile/templates/user_index.html
@@ -34,10 +34,12 @@
{% block nav_menu %}
{% if user != c.user %}
- <a id="user-message" href="send_message" class="btn">
- <b data-icon="{{g.icons['mail'].char}}" class="ico {{g.icons['mail'].css}}"></b>
- <span>Send Message</span>
- </a>
+ {{ g.icons['mail'].render(
+ title='Send Message',
+ show_title=True,
+ href='send_message',
+ extra_css='btn',
+ id='user-message') }}
{% endif %}
{{super()}}
{% endblock %}
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 850938e..0e22348 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -235,18 +235,18 @@ class Globals(object):
history=Icon('fa fa-calendar', 'History'),
feed=Icon('fa fa-rss', 'Feed'),
mail=Icon('fa fa-envelope-o', 'Subscribe'),
- reply=Icon('w', 'ico-reply'),
+ reply=Icon('fa fa-reply', 'Reply'),
tag=Icon('fa fa-tag', 'Tag'),
- flag=Icon('^', 'ico-flag'),
+ flag=Icon('fa fa-flag-o', 'Flag'),
undelete=Icon('fa fa-undo', 'Undelete'),
delete=Icon('fa fa-trash-o', 'Delete'),
- close=Icon('D', 'ico-close'),
- table=Icon('n', 'ico-table'),
+ close=Icon('fa fa-close', 'Close'),
+ table=Icon('fa fa-table', 'Table'),
stats=Icon('fa fa-line-chart', 'Stats'),
- pin=Icon('@', 'ico-pin'),
- folder=Icon('o', 'ico-folder'),
- fork=Icon('R', 'ico-fork'),
- merge=Icon('J', 'ico-merge'),
+ pin=Icon('fa fa-mail-pin', 'Pin'),
+ 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'),
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/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 184ff58..e47065c 100644
--- a/Allura/allura/nf/allura/css/allura.css
+++ b/Allura/allura/nf/allura/css/allura.css
@@ -30,8 +30,15 @@ b.ico {
background-repeat: no-repeat;
vertical-align: middle;
}
-a.fa { color: rgb(85, 85, 85); }
-a.fa:hover { text-decoration: none; }
+a.fa,
+a.fa:hover {
+ text-decoration: none;
+ color: rgb(85, 85, 85);
+}
+.modal .fa {
+ color: white;
+ float: right;
+}
a.btn.fa { font-family: FontAwesome; }
a.fa > span { font-family: sans-serif; }
h2.dark b.ico, .modal b.ico {background-image: url('../images/neo-icon-set-ffffff-256x350.png');}
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/Allura/allura/templates/app_admin_webhooks_list.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/app_admin_webhooks_list.html b/Allura/allura/templates/app_admin_webhooks_list.html
index a4efb97..f61feec 100644
--- a/Allura/allura/templates/app_admin_webhooks_list.html
+++ b/Allura/allura/templates/app_admin_webhooks_list.html
@@ -33,12 +33,11 @@
<td>{{ wh.secret or '' }}</td>
<td><a href="{{wh.url()}}">Edit</a></td>
<td>
- <a href="{{admin_url}}/{{hook.type}}/delete"
- class="delete-link"
- data-id="{{h.really_unicode(wh._id)}}"
- title="Delete">
- <b data-icon="{{g.icons['delete'].char}}" class="ico {{g.icons['delete'].css}}" title="Delete"></b>
- </a>
+ {{ g.icons['delete'].render(
+ href='{}/{}/delete'.format(admin_url, hook.type),
+ extra_css='delete-link',
+ show_title=True,
+ **{'data-id': h.really_unicode(wh._id)}) }}
</td>
</tr>
{% endfor %}
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/Allura/allura/templates/repo/diff.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/diff.html b/Allura/allura/templates/repo/diff.html
index 217e48f..aa2f742 100644
--- a/Allura/allura/templates/repo/diff.html
+++ b/Allura/allura/templates/repo/diff.html
@@ -53,7 +53,7 @@
{% else %}
<div class="clip grid-19 diffbrowser">
<h3>
- <span class="ico-l"><b data-icon="{{g.icons['table'].char}}" class="ico {{g.icons['table'].css}}"></b> {{h.really_unicode(a.filename) or h.html.literal(' ')}}</span>
+ {{ g.icons['table'].render(title=h.really_unicode(a.filename) or ' ', show_title=True) }}
<span class="fright">
{% if session.diformat == 'sidebyside' %}
{% set switch_url = request.url.replace('&diformat=sidebyside', '') + '&diformat=regular' %}
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/Allura/allura/templates/repo/file.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/file.html b/Allura/allura/templates/repo/file.html
index 7221557..cad455b 100644
--- a/Allura/allura/templates/repo/file.html
+++ b/Allura/allura/templates/repo/file.html
@@ -82,7 +82,7 @@
<p><a href="?format=raw">Download this file</a></p>
<div class="clip grid-19 codebrowser">
<h3>
- <span class="ico-l"><b data-icon="{{g.icons['table'].char}}" class="ico {{g.icons['table'].css}}"></b> {{h.really_unicode(blob.name)}}</span>
+ {{ g.icons['table'].render(title=h.really_unicode(blob.name), show_title=True) }}
{{ stats.line_count }} lines ({{ stats.data_line_count }} with data), {{ stats.code_size|filesizeformat }}
</h3>
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/Allura/allura/templates/widgets/flag_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/flag_post.html b/Allura/allura/templates/widgets/flag_post.html
index bb77fa6..64a7d6e 100644
--- a/Allura/allura/templates/widgets/flag_post.html
+++ b/Allura/allura/templates/widgets/flag_post.html
@@ -19,6 +19,6 @@
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
<form method="POST" action="{{action}}">
<input type="hidden" name="delete" value="True"/>
- <a href="" title="Flag as inappropriate or spam" class="flag_post ico-l"><b data-icon="{{g.icons['flag'].char}}" class="ico {{g.icons['flag'].css}}"></b> <span>Flag</span></a>
+ {{ g.icons['flag'].render(show_title=True, extra_css='flag_post') }}
{{lib.csrf_token()}}
</form>
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/Allura/allura/templates/widgets/lightbox.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/lightbox.html b/Allura/allura/templates/widgets/lightbox.html
index 4c5210d..8297226 100644
--- a/Allura/allura/templates/widgets/lightbox.html
+++ b/Allura/allura/templates/widgets/lightbox.html
@@ -17,7 +17,7 @@
under the License.
-#}
<div id="lightbox_{{name}}" class="modal" style="display:none">
- <b data-icon="{{g.icons['close'].char}}" class="ico {{g.icons['close'].css}} close"></b>
+ {{ g.icons['close'].render(extra_css='close') }}
{% if content_template %}
{% include content_template with context %}
{% else %}
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/Allura/allura/templates/widgets/markdown_edit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/markdown_edit.html b/Allura/allura/templates/widgets/markdown_edit.html
index 773ea09..8ed865d 100644
--- a/Allura/allura/templates/widgets/markdown_edit.html
+++ b/Allura/allura/templates/widgets/markdown_edit.html
@@ -20,7 +20,7 @@
<div class="markdown_edit">
<textarea id="{{id or rendered_name}}" name="{{rendered_name}}" class="{{widget.css_class}}" {{widget.j2_attrs(attrs)}}>{{value or ''}}</textarea>
<div class="modal markdown_help" style="display:none">
- <b data-icon="{{g.icons['close'].char}}" class="ico {{g.icons['close'].css}} close"></b>
+ {{ g.icons['close'].render(extra_css='close') }}
<div class="markdown_help_contents" data-url="{{c.app.url}}markdown_syntax_dialog"></div>
</div>
<input type="hidden" class="markdown_project" value="{{c.project.shortname}}">
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index a0e4545..7e22dbf 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -97,7 +97,10 @@
</div>
<div class="options grid-3">
{% if h.has_access(value.thread, 'post')() %}
- <a href="#" class="reply_post btn"{%if value.status == 'pending'%} style="display:none"{%endif%}><b data-icon="{{g.icons['reply'].char}}" class="ico {{g.icons['reply'].css}}"></b>Reply</a>
+ {{ g.icons['reply'].render(
+ show_title=True,
+ extra_css='reply_post btn',
+ style='display:none;' if value.status == 'pending' else '') }}
{% endif %}
<div style="clear:both">
<div class="little_link">
@@ -115,7 +118,7 @@
</div>
</div>
<div class="shortlink_popup modal" style="display: none">
- <b data-icon="{{g.icons['close'].char}}" class="ico {{g.icons['close'].css}} close"></b>
+ {{ g.icons['close'].render(extra_css='close') }}
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
<input type="text" style="width:100%" value="{{shortlink_url}}">
</div>
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/Allura/allura/templates/widgets/threads_table.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/threads_table.html b/Allura/allura/templates/widgets/threads_table.html
index 301b93b..dd85892 100644
--- a/Allura/allura/templates/widgets/threads_table.html
+++ b/Allura/allura/templates/widgets/threads_table.html
@@ -40,7 +40,7 @@
{% if not thread.first_post %}
<td class="topic">
{% if 'flags' in thread and 'Sticky' in thread.flags %}
- <a href="{{thread.url()}}" class="btn"><b data-icon="{{g.icons['pin'].char}}" class="ico {{g.icons['pin'].css}}"></b> <span>Sticky</span></a>
+ {{ g.icons['pin'].render(href=thread.url(), extra_css='btn', title='Sticky', show_title=True) }}
{% endif %}
<h3><a href="{{thread.url()}}">{{thread.subject and h.text.truncate(thread.subject, 72) or '(no subject)'}}</a></h3>
</td>
@@ -48,7 +48,7 @@
<td class="topic">
{% set author = thread.first_post.author() %}
{% if 'flags' in thread and 'Sticky' in thread.flags %}
- <a href="{{thread.url()}}" class="btn ico"><b data-icon="{{g.icons['pin'].char}}" class="ico {{g.icons['pin'].css}}"></b> <span>Sticky</span></a>
+ {{ g.icons['pin'].render(href=thread.url(), extra_css='btn', title='Sticky', show_title=True) }}
{% endif %}
<h3><a href="{{thread.url()}}">{{thread.subject and h.text.truncate(thread.subject, 72) or '(no subject)'}}</a></h3>
<span>By {{lib.user_link(author)}}</span> on {{thread.first_post.timestamp.strftime('%a %b %d, %Y %I:%M %p')}}
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index 25f82a1..67323a6 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -100,7 +100,7 @@
</a>
{% endif %}
<a href="{{att.url()}}">{{att.filename}}</a>
- <a href="{{att.url()}}" class="btn delete_attachment"><b data-icon="{{g.icons['delete'].char}}" class="ico {{g.icons['delete'].css}}"></b></a>
+ {{ g.icons['delete'].render(href=att.url(), extra_css='btn delete_attachment') }}
</div>
{% endfor %}
</div>
http://git-wip-us.apache.org/repos/asf/allura/blob/dc1a8a59/ForgeWiki/forgewiki/templates/wiki/page_history.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_history.html b/ForgeWiki/forgewiki/templates/wiki/page_history.html
index d191337..0de9ef9 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_history.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_history.html
@@ -52,8 +52,10 @@
<td><input name="v2" type="radio" value="{{p.version}}"/></td>
<td class="tright">
{% if i != 0 and h.has_access(p, 'edit')() %}
- <a class="post-link" data-dialog-id="{{p.version}}" href="#"><b data-icon="{{g.icons['fork'].char}}" class="ico {{g.icons['fork'].css}}" title="Revert to version {{p.version}}"></b></a>
-
+ {{ g.icons['fork'].render(
+ extra_css='post-link',
+ title='Revert to version {}'.format(p.version),
+ **{'data-dialog-id': p.version}) }}
<div class="confirmation_dialog_{{p.version}}" style="display:none">
<b class="ico ico-close close" data-icon="D"></b>
<h1>Confirm revert to version {{p.version}}</h1>