tidying up the logged in pages more

manybots · Apr 25, 2012 · 4227f19 · 4227f19
1 parent a3a8843
commit 4227f19
Show file tree

Hide file tree

Showing 3 changed files with 190 additions and 23 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -7,4 +7,167 @@
 *= require bootstrap_and_overrides
 *= require bootstrap-datepicker
 *= require manybots.omnisearch
-*/
+*/
+
+
+/* Activities */
+
+ul#activities {
+  padding: 0;
+  margin: 0;
+  list-style:none;
+}
+
+img.activity-icon {
+	border:1px solid #ccc;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+	box-shadow: 0px 1px 3px #ccc;
+
+}
+
+ul#activities li {
+  padding: 0;
+  margin-bottom: 20px;
+}
+
+.activity.wrapper {
+  width: 650px;
+  padding-bottom: 15px;
+}
+
+.activity.avatar {
+  float:left;
+  width: 50px;
+}
+
+.activity.content {
+  float: left;
+  width: 450px;
+}
+.activity.title {
+  font-size: 1.1em;
+  margin-bottom: 3px;
+}
+
+.activity.footer {
+  margin: 3px 0;
+}
+
+.activity.object {
+  margin-bottom: 3px;
+}
+
+.activity.via {
+  line-height: 32px;
+  font-size: 12px;
+  padding-left: 36px;
+}
+
+.activity.tag {font-size: 14px; background: url('icons/tag_orange.png') 0 0 no-repeat; padding-left: 18px; line-height: 16px; font-weight: normal;}
+.activity.tag a  {font-size: 12px;}
+
+.pagination {
+  text-align: right;
+  margin-bottom: 5px;
+}
+
+/* Filters */
+
+.filters {
+  /*border: 1px gray solid;*/
+  padding: 10px;
+  background-color: whiteSmoke;
+  margin-bottom: 20px;
+}
+
+.filters p {
+  margin: 0;
+}
+
+.filters span.name {
+  padding: 0 5px;
+}
+
+.filters ul {
+  list-style: none;
+}
+
+.selected {
+  background-color: yellow;
+}
+
+/* CALENDARS */
+
+#loading {
+	background: url(icons/ajax-loader.gif) 0 0 no-repeat;
+	padding-left: 20px;
+	line-height: 16px;
+}
+
+.calendar.icon {font-size: 14px; background: url('icons/calendar_view_month.png') 0 0 no-repeat; padding-left: 18px; line-height: 16px; font-weight: normal;}
+
+a.show.calendar {
+  font-size: 12px;
+}
+
+#calendar h2, #campaign_calendar h2, .quarter.calendar h2 {
+  margin: 0;
+}
+
+#calendar .fc-header, 
+#campaign_calendar .fc-header, 
+.quarter.calendar .fc-header {
+  margin: 0;
+  height: 65px;
+}
+#calendar .fc-header td, 
+#campaign_calendar .fc-header td,
+#calendar-1 .fc-header td,
+#calendar-2 .fc-header td, 
+#calendar-3 .fc-header td {
+  border: 0;
+}
+
+.quarter.calendar td.fc-header-right table,
+.quarter.calendar td.fc-header-left table, {
+  margin-bottom: 0;
+}
+
+/* Apps */
+
+ul.apps {
+  padding: 0;
+  margin: 0;
+}
+
+li.client_application h4{
+  margin: 0;
+  padding: 0;
+}
+li.client_application h4 a{
+  color: black;
+}
+
+li.client_application {
+  padding: 0;
+  list-style: none;
+  color: #666;
+  font-size: .9em;
+  width: auto;
+}
+
+li.client_application.resource {
+  list-style: outside;
+}
+
+li.client_application.resource h4 {
+  margin: 0;
+  padding: 0;
+}
+
+li.client_application.resource p{
+  margin: 0;
+  padding:0;
+}
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -135,7 +135,7 @@ font-size: 39px !important;
 font-family: 'PerspectiveSansBold', Arial, Helvetica, sans-serif !important;
 color: #555 !important;
 text-shadow: 0px 1px 0px white;
-padding: 15px 60px 15px 20px;
+padding: 24px 40px 0px 20px;
 }
 .navbar .caret {
 border-top: 4px solid black !important;
@@ -146,6 +146,7 @@ color: #1A4F68 !important;
 .header-search {
 display: inline-block;
 float: left;
+margin-bottom: 7px;
 }
 .navbar-search {
 float:none;
@@ -157,6 +158,7 @@ float: right;
 .navbar .nav {
 float:right;
 margin: 0;
+padding-top: 13px;
 }
 .navbar .nav > li > a {
 display: inline-block;
@@ -223,4 +225,7 @@ position: absolute;
 bottom: 0;
 width: 100%;
 text-align: center;
-}
+}
+#user_avatar {
+  min-height:80px;
+}
diff --git a/app/views/layouts/_app_menu.html.erb b/app/views/layouts/_app_menu.html.erb
@@ -1,36 +1,35 @@
-<div id="app-menu" class="clearfix" style="width: 150px; float:left; display:block; margin-right: 10px;">
-
+<nav>
   <ul class="app-nav">
+    <li class="tcenter">
+      <a href="/calendar/today/notifications">
+        <img id="user_avatar" src="<%= gravatar_url_for(current_user.email)%>" alt="avatar" title="<%= current_user.name %>" width="80" height="80"/>
+      </a>
+    </li>
+
+    <hr class="minimal-hr" style="padding:2px;margin:2px;">
+
     <li><a href="/calendar/today/notifications" class="<%= current_tab?(:controller => 'calendar', :action => 'today')%>">Today</a></li>
     <li><a href="/calendar/tomorrow" class="<%= current_tab?(:controller => 'calendar', :action => 'tomorrow')%>">Tomorrow</a></li>
     <li><a href="/calendar/yesterday" class="<%= current_tab?(:controller => 'calendar', :action => 'yesterday')%>">Yesterday</a></li>
-  </ul>
-
-  <p></p>
-
-  <ul class="app-nav">
+
+    <hr class="minimal-hr" style="padding:2px;margin:2px;;">
+
     <li><a href="/analytics" class="<%= current_tab?(:filters)%>">Analytics</a></li>
     <%- current_user.installed_applications.in_menu.collect(&:client_application).each do |visualization| -%>
-      <li><%= link_to visualization.name, "/visualizations/#{visualization.id}", class: current_tab?(:visualizations, visualization.id) %></li>
+    <li><%= link_to visualization.name, "/visualizations/#{visualization.id}", class: current_tab?(:visualizations, visualization.id) %></li>
     <%- end -%>
     <li><%= link_to 'People', main_app.collection_path('people'), :class => current_tab?(:aggregations, 'people') %></li>
-
     <li><%= link_to 'Library', main_app.aggregations_path, :class => current_tab?(:aggregations) %></li>  
 
-  </ul>
-  <p style="text-align:right;"><a href="/visualizations">More views...</a></p>
-
-  <p></p>
-
-  <ul class="clearfix" style="padding:0;margin:0;">
+    <p style="text-align:right;"><a href="/visualizations">More views...</a></p>
+    <hr class="minimal-hr" style="padding:2px;margin:2px;">
+
     <%- ClientApplication.where(is_public: true).each do |app| -%>
       <li style="display:inline; margin: 0;" >
         <a href="<%=app.url%>" title="<%= app.name %>" class="">
         <%= image_tag app.app_icon_url, :class => 'app_icon small', :width => 32, :height => 32 -%></a>
       </li>
     <%- end  -%>
-  </ul>
-  <p style="text-align:right;"><a href="/apps">More apps...</a></p>
-
-
-</div>
+    <p style="text-align:right;"><a href="/apps">More apps...</a></p>
+  </ul> 
+</nav>