allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [17/28] allura git commit: [#7924] ticket:853 Update more icons
Date Fri, 23 Oct 2015 14:49:17 GMT
[#7924] ticket:853 Update more icons


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/23261e0a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/23261e0a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/23261e0a

Branch: refs/heads/ib/7924
Commit: 23261e0a4c23d2c23a3066ce6946e0b2aada3cb3
Parents: 6ae9159
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Thu Oct 22 19:08:02 2015 +0300
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Thu Oct 22 19:08:02 2015 +0300

----------------------------------------------------------------------
 .../ext/admin/templates/admin_widgets/metadata_admin.html   | 9 +++++----
 Allura/allura/lib/app_globals.py                            | 4 ++++
 Allura/allura/lib/widgets/resources/css/add_project.css     | 2 +-
 Allura/allura/public/nf/js/allura-base.js                   | 2 +-
 Allura/allura/public/nf/js/jquery.notify.js                 | 2 +-
 .../allura/templates/widgets/neighborhood_add_project.html  | 8 ++++----
 Allura/allura/templates/widgets/threads_table.html          | 2 +-
 Allura/allura/templates/widgets/vote.html                   | 4 ++--
 ForgeWiki/forgewiki/templates/wiki/page_edit.html           | 2 +-
 ForgeWiki/forgewiki/templates/wiki/page_history.html        | 2 +-
 ForgeWiki/forgewiki/templates/wiki/page_view.html           | 2 +-
 11 files changed, 22 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/23261e0a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
index 0b3659c..d7a1506 100644
--- a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
@@ -100,12 +100,13 @@
       {% if value.icon %}
         <div class="viewer" style="overflow: auto">
           <img src="{{value.url()}}icon?{{value.icon._id.generation_time}}" style="float:left;
margin-right: 1em;" alt="">
-          <a id="edit-icon" href="#" title="Edit" style="display:inline-block;margin-top:15px"><b
data-icon="p" class="ico ico-pencil"></b></a>
-          <a id="delete-icon" href="#" title="Remove" style="display:inline-block;margin-top:15px"><b
data-icon="d" class="ico ico-delete"></b></a>
+          {{ g.icons['edit'].render(id='edit-icon', style='display:inline-block;margin-top:15px')
}}
+          {{ g.icons['delete'].render(id='delete-icon', style='display:inline-block;margin-top:15px')
}}
         </div>
       {% else %}
         <div class="viewer">
-          No {% if c.project.is_user_project %}user{% endif %} icon. <a id="edit-icon"
href="#" title="Edit">Upload one <b data-icon="p" class="ico ico-pencil"></b></a>
+          No {% if c.project.is_user_project %}user{% endif %} icon.
+          {{ g.icons['edit'].render(id='edit-icon', title='Upload one', show_title=True)
}}
         {% if c.project.is_user_project %}<br><small>
             Or a  <a href="http://gravatar.com/">gravatar.com</a> image will
be used if available.</small>{% endif %}
         </div>
@@ -129,7 +130,7 @@
         {% elif value.removal == 'deleted' -%}
             Deleted
         {% endif %}
-        <a href="#" title="Edit"><b data-icon="p" class="ico ico-pencil"></b></a>
+        {{ g.icons['edit'].render() }}
         <div id="project-status-edit" class="{% if not c.form_errors %}hidden{% endif
%}">
             <br>
             {% if c.form_errors.get('moved_to_url') %}

http://git-wip-us.apache.org/repos/asf/allura/blob/23261e0a/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index ff5ecdb..191d2f6 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -255,6 +255,10 @@ class Globals(object):
             star=Icon('fa fa-star', 'Star'),
             expand=Icon('fa fa-expand', 'Maximize'),
             restore=Icon('fa fa-compress', 'Restore'),
+            check=Icon('fa fa-check-circle', 'Check'),
+            caution=Icon('fa fa-ban', 'Caution'),
+            vote_up=Icon('fa fa-plus', 'Vote Up'),
+            vote_down=Icon('fa fa-minus', 'Vote Down'),
             # Permissions
             perm_read=Icon('fa fa-eye', 'Read'),
             perm_update=Icon('fa fa-rotate-left', 'Update'),

http://git-wip-us.apache.org/repos/asf/allura/blob/23261e0a/Allura/allura/lib/widgets/resources/css/add_project.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/add_project.css b/Allura/allura/lib/widgets/resources/css/add_project.css
index fc3d6dd..1b25626 100644
--- a/Allura/allura/lib/widgets/resources/css/add_project.css
+++ b/Allura/allura/lib/widgets/resources/css/add_project.css
@@ -56,7 +56,7 @@ div.welcome .success, .success_icon {
     display: none;
     position: absolute;
     left: -50px;
-    top: 10px;
+    top: 8px;
     z-index: 2;
 }
 .error_icon.allura, .success_icon.allura {

http://git-wip-us.apache.org/repos/asf/allura/blob/23261e0a/Allura/allura/public/nf/js/allura-base.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/allura-base.js b/Allura/allura/public/nf/js/allura-base.js
index b1c7c3d..3f6d45e 100644
--- a/Allura/allura/public/nf/js/allura-base.js
+++ b/Allura/allura/public/nf/js/allura-base.js
@@ -36,7 +36,7 @@
     // Setup editable widgets
     $('div.editable, span.editable, h1.editable')
         .find('.viewer')
-        .append('<a class="edit_btn btn"><b data-icon="p" class="ico ico-pencil"></b></a>')
+        .append('<a class="edit_btn btn"><b class="fa fa-edit"></b></a>')
         .end()
         .click(function(e){
             var editable = $(this).closest('.editable');

http://git-wip-us.apache.org/repos/asf/allura/blob/23261e0a/Allura/allura/public/nf/js/jquery.notify.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/jquery.notify.js b/Allura/allura/public/nf/js/jquery.notify.js
index a12cfc3..52a2484 100644
--- a/Allura/allura/public/nf/js/jquery.notify.js
+++ b/Allura/allura/public/nf/js/jquery.notify.js
@@ -158,7 +158,7 @@
         activeClass: 'notify-active',
         inactiveClass: 'notify-inactive',
         messageClass: 'message',
-        closeIcon: '<b title="Close" class="ico ico-close" data-icon="D"></b>'
+        closeIcon: '<b title="Close" class="fa fa-close" style="float:right;"></b>'
     };
     
 }(jQuery));

http://git-wip-us.apache.org/repos/asf/allura/blob/23261e0a/Allura/allura/templates/widgets/neighborhood_add_project.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/neighborhood_add_project.html b/Allura/allura/templates/widgets/neighborhood_add_project.html
index a84f9b5..3faeb5d 100644
--- a/Allura/allura/templates/widgets/neighborhood_add_project.html
+++ b/Allura/allura/templates/widgets/neighborhood_add_project.html
@@ -27,8 +27,8 @@
         </div>
         <div class="grid-10">{{widget.display_field(widget.fields.project_name)}}</div>
         <div class="grid-9" style="position:relative; overflow:visible">
-            <b data-icon="!" class="ico ico-caution error_icon" title="Caution"></b>
-            <b data-icon="2" class="ico ico-checkcircle success_icon" title="Check"></b>
+            {{ g.icons['caution'].render(tag='b', extra_css='error_icon') }}
+            {{ g.icons['check'].render(tag='b', extra_css='success_icon') }}
         </div>
         <div style="clear:both">&nbsp;</div>
         <div class="grid-4" style="text-align: right; padding-top: 7px;">
@@ -40,8 +40,8 @@
             <br/><div id="project_url">http://{{request.environ['HTTP_HOST']}}{{neighborhood.url()}}<span
id="url_fragment"></span></div>
         </div>
         <div class="grid-9" style="position:relative; overflow:visible">
-            <b data-icon="!" class="ico ico-caution error_icon" title="Caution"></b>
-            <b data-icon="2" class="ico ico-checkcircle success_icon" title="Check"></b>
+            {{ g.icons['caution'].render(tag='b', extra_css='error_icon') }}
+            {{ g.icons['check'].render(tag='b', extra_css='success_icon') }}
         </div>
         {{widget.display_field(widget.fields.neighborhood)}}
         <div style="clear:both">&nbsp;</div>

http://git-wip-us.apache.org/repos/asf/allura/blob/23261e0a/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 dd85892..5a52f99 100644
--- a/Allura/allura/templates/widgets/threads_table.html
+++ b/Allura/allura/templates/widgets/threads_table.html
@@ -22,7 +22,7 @@
   <table class="forum-list clear">
     <thead>
       <tr>
-        <th><span class="ico ico-mail" title="Subscriptions" data-icon="M"></span></th>
+        <th>{{ g.icons['mail'].render(tag='span', title='Subscriptions') }}</th>
         <th class="topic">Topic</th>
         <th>Posts</th>
         <th>Views</th>

http://git-wip-us.apache.org/repos/asf/allura/blob/23261e0a/Allura/allura/templates/widgets/vote.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/vote.html b/Allura/allura/templates/widgets/vote.html
index 7a04a1c..533ada5 100644
--- a/Allura/allura/templates/widgets/vote.html
+++ b/Allura/allura/templates/widgets/vote.html
@@ -25,10 +25,10 @@
 <div id="vote" class="gray">
   <span class="btn-set duo">
   <a href="" class="btn {% if voted == 1 %}active{% endif %} {% if can_vote %}js-vote-up{%
endif %}" onclick="javascript:return false;">
-    <b data-icon="+" class="ico ico-vote-up"></b>
+    {{ g.icons['vote_up'].render(tag='b', style="color:green;") }}
   </a>
   <a href="" class="btn {% if voted == -1 %}active{% endif %} {% if can_vote %}js-vote-down{%
endif %}" onclick="javascript:return false;">
-    <b data-icon="-" class="ico ico-vote-down"></b>
+    {{ g.icons['vote_down'].render(tag='b', style="color:red;") }}
   </a>
   </span>
   <div class="grid-8 vote-text">

http://git-wip-us.apache.org/repos/asf/allura/blob/23261e0a/ForgeWiki/forgewiki/templates/wiki/page_edit.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_edit.html b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
index 5b3bada..31ff5ae 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_edit.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_edit.html
@@ -36,7 +36,7 @@
   {% if page_exists and h.has_access(page, 'delete')() %}
     {{ g.icons['delete'].render(extra_css='post-link') }}
     <div class="confirmation_dialog" style="display:none">
-        <b class="ico ico-close close" data-icon="D"></b>
+        {{ g.icons['close'].render(tag='b', extra_css='close') }}
 
         <h1>Confirm page deletion</h1>
         <p>

http://git-wip-us.apache.org/repos/asf/allura/blob/23261e0a/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 0de9ef9..753454d 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_history.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_history.html
@@ -57,7 +57,7 @@
                   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>
+                {{ g.icons['close'].render(tag='b', extra_css='close') }}
                 <h1>Confirm revert to version {{p.version}}</h1>
                 <p>
                   Do you really want to revert page to version {{p.version}}?

http://git-wip-us.apache.org/repos/asf/allura/blob/23261e0a/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index 01bc09e..51e8d95 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -48,7 +48,7 @@
   {% elif h.has_access(page, 'delete')() %}
     {{ g.icons['undelete'].render(extra_css='post-link') }}
     <div class="confirmation_dialog" style="display:none">
-        <b class="ico ico-close close" data-icon="D"></b>
+        {{ g.icons['close'].render(tag='b', extra_css='close') }}
         <h1>Confirm page restoration</h1>
         <p>
             Do you really want to restore the page?


Mime
View raw message