Merge pull request #880 from gokaygurcan/1.x

Fix reload and restart icons
ajenti · Feb 24, 2016 · e256601 · e256601
2 parents 9457351 + 61ad199
commit e256601
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 9 deletions.
diff --git a/ajenti/plugins/apache/main.py b/ajenti/plugins/apache/main.py
@@ -14,7 +14,7 @@ class Apache(WebserverPlugin):
         {
             'command': 'force-reload',
             'text': _('Reload'),
-            'icon': 'step-forward',
+            'icon': 'reload',
         }
     ]
     hosts_available_dir = platform_select(

diff --git a/ajenti/plugins/bind9/layout/main.xml b/ajenti/plugins/bind9/layout/main.xml
@@ -6,7 +6,7 @@
             [{
                 'command': 'force-reload',
                 'text': _('Reload'),
-                'icon': 'step-forward',
+                'icon': 'reload',
             }]
         " />
     <body>

diff --git a/ajenti/plugins/main/content/css/icons.i.less b/ajenti/plugins/main/content/css/icons.i.less
@@ -312,6 +312,10 @@ ul.icons {
 .icon-eject:before {
   content: "\f052";
 }
+.icon-reload:before,
+.icon-restart:before {
+  content: "\f021";
+}
 .icon-chevron-left:before {
   content: "\f053";
 }

diff --git a/ajenti/plugins/mysql/main.py b/ajenti/plugins/mysql/main.py
@@ -19,7 +19,7 @@ class MySQLPlugin (DBPlugin):
         {
             'command': 'reload',
             'text': _('Reload'),
-            'icon': 'step-forward',
+            'icon': 'reload',
         }
     ]
 

diff --git a/ajenti/plugins/nginx/main.py b/ajenti/plugins/nginx/main.py
@@ -14,7 +14,7 @@ class Nginx(WebserverPlugin):
         {
             'command': 'force-reload',
             'text': _('Reload'),
-            'icon': 'step-forward',
+            'icon': 'reload',
         }
     ]
     hosts_available_dir = platform_select(

diff --git a/ajenti/plugins/psql/main.py b/ajenti/plugins/psql/main.py
@@ -11,7 +11,7 @@ class PSQLPlugin (DBPlugin):
         {
             'command': 'reload',
             'text': _('Reload'),
-            'icon': 'step-forward',
+            'icon': 'reload',
         }
     ]
 

diff --git a/ajenti/plugins/services/layout/bar.xml b/ajenti/plugins/services/layout/bar.xml
@@ -1,5 +1,5 @@
 <hc id="buttons">
     <button id="start" icon="play" text="{Start}" />
     <button id="stop" icon="stop" text="{Stop}" />
-    <button id="restart" icon="step-forward" text="{Restart}" />
+    <button id="restart" icon="restart" text="{Restart}" />
 </hc>
diff --git a/ajenti/plugins/services/layout/main.xml b/ajenti/plugins/services/layout/main.xml
@@ -23,7 +23,7 @@
                                 <button id="stop" icon="stop" style="mini" />
                             </tooltip>
                             <tooltip text="{Restart}">
-                                <button id="restart" icon="step-forward" style="mini" />
+                                <button id="restart" icon="restart" style="mini" />
                             </tooltip>
                         </hc>
                     </dtd>

diff --git a/ajenti/plugins/services/layout/widget.xml b/ajenti/plugins/services/layout/widget.xml
@@ -13,7 +13,7 @@
         <button id="stop" icon="stop" style="mini" visible="False" />
     </tooltip>
     <tooltip text="{Restart}">
-        <button id="restart" icon="step-forward" style="mini" visible="False" />
+        <button id="restart" icon="restart" style="mini" visible="False" />
     </tooltip>
 
     <dialog id="config-dialog" visible="False">

diff --git a/ajenti/plugins/supervisor/layout/main.xml b/ajenti/plugins/supervisor/layout/main.xml
@@ -6,7 +6,7 @@
             [{
                 'command': 'force-reload',
                 'text': _('Reload'),
-                'icon': 'step-forward',
+                'icon': 'reload',
             }]
         " />