improved package and global menu

2 files changed, 15 insertions, 15 deletions

diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index fddbf219c..6ec187440 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -44,9 +44,8 @@
                     {#                    <a class="header-link" href="/settings"><i class="icon-cog icon-white"></i> Settings</a>#}

                     {#                    <a class="header-link" href="#"><i class="icon-list-alt icon-white"></i> Accounts</a>#}

                     <span class="iconbar">

-                        <i class="iconf-play iconf-large"></i>&nbsp;

-                        <i class="iconf-pause iconf-large"></i>&nbsp;

-                        <i class="iconf-cog iconf-large"></i>

+                        <i class="iconf-play iconf-large"></i>&nbsp; Running&nbsp;&nbsp;

+                        <i class="iconf-repeat iconf-large"></i>&nbsp; Reconnect

                     </span>

                     <br>

                     <a class="btn btn-success btn-grabber" href="#"><i class="icon-plus icon-white"></i> Add</a>

@@ -56,11 +55,11 @@
                         <a class="btn btn-blue dropdown-toggle" data-toggle="dropdown" href="#"><span

                                 class="caret"></span></a>

                         <ul class="dropdown-menu" style="right: 0; left: -100%">

-                            <li><a href="#"><i class="icon-pencil"></i> Edit</a></li>

-                            <li><a href="#"><i class="icon-trash"></i> Delete</a></li>

+                            <li><a href="/"><i class="iconf-list-alt"></i> Dashboard</a></li>

+                            <li><a href="/settings"><i class="iconf-wrench"></i> Settings</a></li>

+                            <li><a href="/admin"><i class="iconf-cogs"></i> Admin</a></li>

                             <li class="divider"></li>

-                            <li><a href="/admin"><i class="icon-star"></i> Admin</a></li>

-                            <li><a href="/settings"><i class="icon-wrench"></i> Settings</a></li>

+                            <li><a href="/logout"><i class="iconf-signout"></i> Logout</a></li>

                         </ul>

                     </div>

 

diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
index 2de3a999d..5c15186df 100644
--- a/module/web/templates/default/dashboard.html
+++ b/module/web/templates/default/dashboard.html
@@ -35,13 +35,15 @@
                 <% else %>

                 <i class="iconf-eye-close" data-toggle="tooltip" title="Package is private"></i>

                 <%/if%>

-                <i class="iconf-trash" data-toggle="tooltip" title="Delete Package"></i>

                 <i class="iconf-chevron-down" data-toggle="dropdown">

                 </i>

                 <ul class="dropdown-menu">

-                    <li><a>Link</a></li>

-                    <li><a>Link</a></li>

-                    <li><a>Link</a></li>

+                    <li><a href="#"><i class="iconf-share"></i> Show</a></li>

+                    <li><a href="#"><i class="iconf-edit"></i> Details</a></li>

+                    <li><a href="#"><i class="iconf-trash"></i> Delete</a></li>

+                    <li><a href="#"><i class="iconf-refresh"></i> Recheck</a></li>

+                    <li class="divider"></li>

+                    <li><a>Addons</a></li>

                 </ul>

             </div>

             <div class="progress">

@@ -83,11 +85,10 @@
 

     <script type="text/template" id="template-select">

         <i class="iconf-check" data-toggle="tooltip" title="Deselect"></i>&nbsp;

-        <%= if packs %>

-        <% packs %> packages

-        <%/if %>

+        <%= if packs %><% packs %> package(s)<%/if %>

         <%= if files %>

-        <% files %> files

+        <%= if packs %>, <%/if %>

+        <% files %> file(s)

         <%/if %>

         selected

         &nbsp;|&nbsp;