Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Developed the admin dashboard a bit, especially top banner area with …

…key info
  • Loading branch information...
commit ee53f8d421cd703d1a41c65337437412774168bb 1 parent 2374d68
@brzaik brzaik authored
View
0  .../stylesheets/application/common/font-awesome.scss → ...lesheets/application/common/font-awesome.scss.erb
File renamed without changes
View
3  app/assets/stylesheets/application/index-manifest.scss
@@ -25,5 +25,4 @@
@import "layout/responsive-utilities";
@import "layout/responsive-767px-max";
@import "layout/responsive-768px-979px";
-@import "layout/responsive-1200px-min";
-
+@import "layout/responsive-1200px-min";
View
1  app/assets/stylesheets/application/layout/alerts-badges.scss.erb
@@ -70,6 +70,7 @@
}
.alert-removeborder {
@include border-radius(0px);
+ margin-bottom: 0px;
}
.badge {
View
56 app/views/dashboard/index.html.erb
@@ -1,17 +1,53 @@
<section class="viewblock">
<header class="viewblock-header">
- <h1 class="default-padding"><%= t(:dashboard) %></h1>
- </header>
+ <h1 class="default-padding"><%= t(:admin_dashboard) %></h1>
+ </header>
<div class="viewblock-cont">
- <%=link_to "Manage Users", users_path %>
- <br />
- Delayed Job Status: <% if @delayed_job_running %>Running<% else %> NOT Running <% end %><br />
- <% if latest_version() > Concerto::VERSION::STRING %>
- New Version Available: <%= latest_version() %>
- <% else %>
- Concerto Version: Current (<%=Concerto::VERSION::STRING%>)
- <% end %>
+
+ <div class="row-fluid">
+ <div class="span4">
+ <div class="default-padding<% if latest_version() > Concerto::VERSION::STRING %> alert alert-block alert-removeborder<% end %>">
+ <h5>Concerto Version:</h5>
+ <h1><%= Concerto::VERSION::STRING %></h1>
+ <% if latest_version() > Concerto::VERSION::STRING %>
+ <i class="ficon-exclamation-sign" style="font-size: 1.4em;"></i> <b>A new version (<%= latest_version() %>) is now available.</b>
+ <% end %>
+ </div>
+ </div>
+ <div class="span4">
+ <div class="default-padding">
+ <h5>Delayed Job Status:</h5>
+ <h1>
+ <% if @delayed_job_running %>
+ <i class="ficon-play-circle"></i> Running
+ <% else %>
+ <i class="ficon-stop"></i> Stopped
+ <% end %>
+ <small style="font-size: 0.4em; padding-left: 16px;"><%= link_to "How to Start/Stop", "#", :style => "text-decoration: underline;" %></small>
+ </h1>
+ </div>
+ </div>
+ <div class="span4">
+ <div class="default-padding">
+ <h5>User Stats:</h5>
+ <h1><%= User.all.size %> <i class="ficon-user"></i> <small style="font-size: 0.4em; padding-left: 16px;"><%= link_to "Manage Users", users_path, :style => "text-decoration: underline;" %></small></h1>
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+</section>
+
+<section class="viewblock">
+ <header class="viewblock-header">
+ <h1 class="default-padding"><%= t(:admin_dashboard) %></h1>
+ </header>
+
+ <div class="viewblock-cont">
+
<%= form_tag "/dashboard/update" do %>
<fieldset>
Please sign in to comment.
Something went wrong with that request. Please try again.