KG - SPARC Proper Header and Root Page Realignment/Styling (1.7.0)

app/assets/stylesheets/dashboard/printer_friendly_requests.css.scss

@@ -43,10 +43,6 @@
     display: none;
   }
 
-  .bug-enhancement-link {
-    display: none;
-  }
-
   .blue_header {
     background: #0775B0;
     color: #fff;

app/assets/stylesheets/hover_effect.scss

@@ -27,7 +27,7 @@
     background-color:#0078AE;
 }
 
-.right-section > li > a:hover{
+.right-section > .user-login-section > li > a:hover{
     background-color:#0078AE;
 }
 

app/assets/stylesheets/navbar.scss

@@ -3,12 +3,11 @@ $navbar-tab-color: #113967;
 .navbar {
   width: 100%;
   float: left;
-  margin: 0 0 3em 0;
   padding: 0;
   list-style: none;
-  background-color: #fff;
   border-bottom: 1px solid #ccc;
-  border-top: 1px solid #fff;
+  border-top: 1px solid #ccc;
+  overflow: hidden;
 }
 
 .navbar li {
@@ -21,32 +20,35 @@ $navbar-tab-color: #113967;
   text-decoration: none;
   font-weight: bold;
   color: #fff;
-  border-right: 1px solid #fff;
 }
 
 .align-element-nav-bar {
   padding: 8px 15px;
   float: right;
 }
 
-.right-section {
+.user-login-section {
   float: right;
 }
 
 .dashboard {
   background-color: $navbar-tab-color;
+  border-right: 1px solid #fff;
 }
 
 .admin {
   background-color: $navbar-tab-color;
+  border-right: 1px solid #fff;
 }
 
 .fulfillment {
   background-color: $navbar-tab-color;
+  border-right: 1px solid #fff;
 }
 
 .catalog {
   background-color: $navbar-tab-color;
+  border-right: 1px solid #fff;
 }
 
 .reports {
@@ -55,4 +57,5 @@ $navbar-tab-color: #113967;
 
 .logout {
   background-color: $navbar-tab-color;
+  border-right: none;
 }

app/assets/stylesheets/proper/layout.css.sass

@@ -115,32 +115,57 @@ button
   width: 962px
   height: 1050px
   margin: 0 auto
+
   #header
-    padding-left: 10px
+    padding-top: 10px
+    padding-bottom: 10px
     height: 102px
-    background: white url("/assets/header_background_gradient.png") left top repeat-x
-  #org_logo, #department_title, #institution_logo
-    float: left
-  #org_logo
-    width: 270px
-    margin-top: 20px
-  #department_title
-    width: 510px
-    margin: 22px 0 0 -4px
-  #institution_logo
-    width: 150px
-    margin: 5px 0 0 13px
-    text-align: right
+    background: white left top repeat-x
+    border-left: outset 1px black
+    border-right: outset 1px black
+
+    #org_logo
+      height: 100%
+      width: 25%
+      float: left
+
+      img
+        max-height: 100%
+        max-width: 77%
+        margin-left: 5%
+        margin-right: 18%
+
+    #sparc_request_header
+      height: 100%
+      width: 50%
+      float: left
+
+      img
+        max-height: 100%
+        max-width: 100%
+
+    #institution_logo
+      height: 100%
+      width: 25%
+      float: left
+
+      img
+        max-height: 100%
+        max-width: 77%
+        margin-left: 18%
+        margin-right: 5%
+
   #content
     background: #FFF
     // height: 1050px
     height: 100%
     width: 960px
     border-left: outset 1px black
     border-right: outset 1px black
-    padding-top: 10px
+
     .pricing-message
       padding-left: 10px
+
   #title
     margin-top: 8px
     background: white url("/assets/banner.png") no-repeat
@@ -213,6 +238,9 @@ div.field_with_errors
 .hidden
   display: none
 
+#ie7_warning
+  display: none
+
 img
   border: 0
 
@@ -293,6 +321,9 @@ p
     font-style: italic
     color: #C43149
 
+#processing_request
+  display: none
+
 .red
   color: red
 
@@ -406,4 +437,3 @@ ul
 
 .white ul
   background: white
-

app/assets/stylesheets/proper/service_catalog.css.sass

@@ -21,11 +21,16 @@
 // RootView
 
 #about
-  width: 220px
   height: 50px
-  background: #FFF
+  width: 240px
+  float: left
+
   a
-    padding-left: 18px
+    margin-left: 33px
+    margin-right: 32px
+
+  img
+    padding-top: 10px
 
 #account
   width: 230px
@@ -97,6 +102,10 @@
   float: right
   cursor: pointer
 
+.catalog-middle
+  margin-left: 5px
+  margin-right: 5px
+
 .catalog-search-spinner, .catalog-search-clear-icon
   float: right
   margin-right: 5px
@@ -127,8 +136,6 @@
 
 .catalog-view-right
   background: #E8E8E8
-  margin-top: -50px !important
-  margin-right: -10px !important
   width: 226px !important
   padding: 2px !important
 
@@ -206,14 +213,25 @@ div#institution_accordion h3.provider_header
 
 .service-catalog
   background: #E8E8E8
-  margin-top: -50px
+
   .ui-accordion-content h4
     padding: 4px 6px
 
 .service-description
   font-size: 12px !important
   font-family: "Calibri", "Helvetica Neue", Helvetica,sans-serif !important
 
+#service_request_protocol_id
+  height: 50px
+  width: 250px
+
+  float: right
+  text-align: center
+  font-size: 20px
+
+  span
+    line-height: 50px
+
 .service-view
   margin: 4px 0
   button
@@ -244,9 +262,11 @@ div#institution_accordion h3.provider_header
   &.green-provider-odd a, &.orange-provider-odd a, &.light-blue-provider-odd a
     color: #FFF !important
 
-.welcome .bug-enhancement-link
-  color: #fff
-  font-size: 14px
+.welcome
+  overflow: hidden
+  background-color: #fff
+  border-left: 1px outset black
+  border-right: 1px outset black
 
 #welcome_msg
   text-align: right

app/views/layouts/application.html.haml

@@ -19,12 +19,13 @@
 -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 !!! 1.1
-%html{"xml:lang" => "en", :xmlns => "http://www.w3.org/1999/xhtml"}
+%html{"xml:lang" => "en", xmlns: "http://www.w3.org/1999/xhtml"}
   %head
-    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
-    %meta{:name => "viewport", :content => "width=device-width, initial-scale=1"}/
-    %title= t 'application_title'
-    = stylesheet_link_tag '960', "#{CUSTOM_ASSET_PATH}application", 'jquery-ui', :media => 'all'
+    %meta{content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    %meta{name: "viewport", content: "width=device-width, initial-scale=1"}/
+    %title
+      = t 'application_title'
+    = stylesheet_link_tag '960', "#{CUSTOM_ASSET_PATH}application", 'jquery-ui', media: 'all'
     /[if IE]
       = stylesheet_link_tag 'ie'
     /[if gt IE 7]
@@ -41,38 +42,44 @@
     = csrf_meta_tags
     :javascript
       window.I18n = #{current_translations.to_json.html_safe};
-  %body{:id => "body"}
+  %body#body
     // add the service_request_id for easy access to it
     = hidden_field_tag(:service_request_id, @service_request.id) if @service_request
     // load spinner and cancel images so they are cached
-    = image_tag 'spinner.gif', :style => 'display:none'
-    = image_tag 'cancel.png', :style => 'display:none'
-    #ie7_warning{:style => 'display: none'}
-      %p= t('ie_warning.text1')
+    = image_tag 'spinner.gif', style: 'display:none'
+    = image_tag 'cancel.png', style: 'display:none'
+    #ie7_warning
+      %p
+        = t('ie_warning.text1')
       %br
-      %p= t('ie_warning.text2')
+      %p
+        = t('ie_warning.text2')
 
     #container.container
-      #processing_request.ui-corner-all{:style => 'display:none'}
+      #processing_request.ui-corner-all
         %br
-        = t(:cm_index)[:processing]
+          = t(:cm_index)[:processing]
         %br
         = image_tag 'spinner.gif'
-
-      = render :partial => 'shared/header_logos'
+      = render 'shared/header_logos', in_dashboard: false
 
       .welcome.col-md-12
         = render 'shared/navbar'
-      #sparc_logo_header
-        = image_tag('sparc_request_header.jpg')
-        #right_header
-          %span#sub_service_request_header
+        #about
+          - unless USE_ABOUT_SPARC_LINK
+            = link_to image_tag("#{CUSTOM_ASSET_PATH}about.png", class: 'button-hover'), "javascript:void(0);", class: "about_sparc_request"
+          - else
+            = link_to image_tag("#{CUSTOM_ASSET_PATH}about.png", class: 'button-hover'), ABOUT_SPARC_URL, target: "_blank"
+        #service_request_protocol_id{class: @sub_service_request ? "" : "hidden"}
+          %span
              
             = show_friendly_ssr_id(@sub_service_request) if @sub_service_request
+
       #content.container_12.row
-        .flash= render "shared/flash"
+        .flash
+          = render "shared/flash"
         = content_for?(:content) ? yield(:content) : yield
       .clear
-      = render :partial => 'shared/footer'
-      = render :partial => 'shared/piwik_tracking' if Rails.env == 'production'
-      = render partial: 'shared/modal'
+      = render 'shared/footer'
+      = render 'shared/piwik_tracking' if Rails.env == 'production'
+      = render 'shared/modal'

app/views/layouts/dashboard/application.html.haml

@@ -37,9 +37,11 @@
 
   %body#body
     #ie7_warning{style: 'display: none'}
-      %p= t('ie_warning.text1')
+      %p
+        = t('ie_warning.text1')
       %br
-      %p= t('ie_warning.text2')
+      %p
+        = t('ie_warning.text2')
 
     #container
       #processing_request.ui-corner-all{style: 'display:none'}
@@ -48,15 +50,15 @@
         %br
         = image_tag 'spinner.gif'
       #header
-        = render partial: 'shared/header_logos'
+        = render 'shared/header_logos', in_dashboard: true
         %input#current_user_id{type: 'hidden', value: @user.try(:id)}
-      = render partial: 'layouts/dashboard/dashboard_header', locals: { user: @user }
-
+      = render 'layouts/dashboard/dashboard_header', user: @user
 
       .notification_dialog
-      .flash= render "shared/flash"
+      .flash
+        = render "shared/flash"
       #inner-content
         = yield
   %footer
-    = render :partial => 'shared/piwik_tracking' if Rails.env == 'production'
-    = render partial: 'shared/modal'
+    = render 'shared/piwik_tracking' if Rails.env == 'production'
+    = render 'shared/modal'

app/views/service_requests/_catalog.html.haml

@@ -22,14 +22,9 @@
 = stylesheet_link_tag 'home_page'
 = stylesheet_link_tag 'hover_effect'
 .grid_3.service-catalog.col-md-3
-  #about
-    - unless USE_ABOUT_SPARC_LINK
-      = link_to image_tag("#{CUSTOM_ASSET_PATH}about.png", class: 'button-hover'), "javascript:void(0);", class: "about_sparc_request"
-    - else
-      = link_to image_tag("#{CUSTOM_ASSET_PATH}about.png", class: 'button-hover'), ABOUT_SPARC_URL, target: "_blank"
   %h3 Browse Services Catalog:
   = render :partial => 'catalogs/service_accordion', :locals => {:institutions => @institutions}
-.grid_6.col-md-6
+.grid_6.col-md-6.catalog-middle
   #search.form-group
     /[if lte IE 8]
       %img(src="/assets/search_bar.png"){:class => 'test_search'}