Added EIS fonts to admin

app/assets/stylesheets/application.css.scss

@@ -1,9 +1,9 @@
-@import "bootstrap-sprockets";
+//= require 'custom-boostrap'
-@import "bootstrap";
 @import "nprogress";
 @import "nprogress-bootstrap";
 @import "bootstrap-ext";
 @import "typeaheadjs";
 @import "selectize";
 @import "selectize.bootstrap3";
+@import "general";
 @import "app";

app/assets/stylesheets/custom-boostrap.scss

@@ -0,0 +1,13 @@
+$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif;
+$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif;
+$navbar-default-bg: #F69240;
+$navbar-default-brand-color: #fff;
+$navbar-default-link-color: #fff;
+$border-radius-base: 2px;
+$body-bg: #F8F8F8;
+$container-large-desktop: 1040px;
+$font-size-h1: 26px;
+$navbar-default-link-active-color: #333;
+
+@import "bootstrap-sprockets";
+@import "bootstrap";

app/assets/stylesheets/depp/application.scss

@@ -1,3 +0,0 @@
-//= require './custom-boostrap'
-//= require './general'
-//= require './overwrites'

app/assets/stylesheets/depp/custom-boostrap.scss

@@ -1,5 +0,0 @@
-$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif;
-$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif;
-
-@import "bootstrap-sprockets";
-@import "bootstrap";

app/assets/stylesheets/depp/overwrites.sass

@@ -1 +0,0 @@
-// Overwrite this file at your application app/assets/stylesheets/depp/overwrite.sass

app/assets/stylesheets/general.sass

@@ -12,12 +12,12 @@ h1
   margin-bottom: 16px
 
 a
-  color: #008fd7
+  color: #23527C
   text-decoration: none
 
 a:hover,
 a:active
-  color: #008fd7
+  color: #23527C
   outline: 0
 
 h1, h2, h3, h4, h1 a, h2 a, h3 a, h4 a

app/views/admin/domain_versions/index.haml

@@ -1,11 +1,7 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back_to_domain), [:admin, @domain], class: 'btn btn-default')
-    %h2.text-center-xs
+= render 'admin/shared/title', name: "#{t(:history)}: #{@domain.name}"
-      = "#{t(:domain_history)}: #{@domain.name}"
-  .col-sm-6
-    %h2.text-right.text-center-xs
 
-%hr
 .row
   .col-md-12
     .table-responsive
@@ -21,6 +17,7 @@
             %th{class: 'col-xs-2'}= t(:registrar)
 
         %tbody
+          - if @domain.versions.present?
             %tr.small
               = render 'admin/domain_versions/version', 
                 domain: @domain, version: @domain.versions.last

app/views/admin/domains/_form.haml

@@ -3,17 +3,12 @@
   - unless @domain.parent_valid?
     %hr
   .row
-    .col-md-12
+    .col-md-8
-      %ul.nav.nav-tabs{:role => "tablist", id: 'tabs'}
-        - li_class = @domain.statuses_tab_valid? ? nil : 'error-tab'
-        %li{class: li_class}
-          %a{"data-toggle" => "tab", :href => "#statuses-tab", :role => "tab"}= t('statuses')
-        / Tab panes
       .tab-content{style:'margin-top: 20px;'}
         #general-tab.tab-pane.active
           = render 'admin/domains/form_partials/statuses', f: f
   .row
-    .col-md-12.text-right
+    .col-md-8.text-right
       = button_tag(t('save'), class: 'btn btn-primary')
 
 :coffee

app/views/admin/domains/edit.haml

@@ -1,9 +1,5 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back_to_domain), [:admin, @domain], class: 'btn btn-default')
-    %h2.text-center-xs
+= render 'admin/shared/title', name: "#{t(:edit)}: #{@domain.name}"
-      = "#{t('edit_domain')}"
+
-  .col-sm-6
-    %h2.text-right.text-center-xs
-      = link_to(t('back_to_domain'), [:admin, @domain], class: 'btn btn-default')
-%hr
 = render 'form'

app/views/admin/registrars/_form.haml

@@ -7,9 +7,15 @@
     %hr
 
   .row
-    .col-md-6
+    .col-md-8
+      .panel.panel-default
+        .panel-heading.clearfix
+          .pull-left= t(:general)
+        .panel-body
           .form-group
+            .col-md-3.control-label
               = f.label :name
+            .col-md-7
               = f.text_field(:name, class: 'form-control')
       .form-group
         = f.label :reg_no
@@ -27,8 +33,8 @@
       .form-group
         = f.label :billing_email
         = f.text_field(:billing_email, class: 'form-control')
-
+  .row
-    .col-md-6.text-left
+    .col-md-8
       .form-group
         = f.label :street
         = f.text_field(:street, class: 'form-control')
@@ -51,5 +57,5 @@
       /   %p.help-block= t('address_help')
   %hr
   .row
-    .col-md-12.text-right
+    .col-md-8.text-right
       = button_tag(t('save'), class: 'btn btn-primary')

app/views/admin/registrars/edit.haml

@@ -1,9 +1,5 @@
-.row
+- content_for :actions do
-  .col-sm-6
+  = link_to(t(:back_to_registrar), [:admin, @registrar], class: 'btn btn-default')
-    %h2.text-center-xs
+= render 'admin/shared/title', name: "#{t(:edit)}: #{@registrar.name}"
-      = "#{t('edit_registrar')}"
+
-  .col-sm-6
-    %h2.text-right.text-center-xs
-      = link_to(t('back_to_registrar'), [:admin, @registrar], class: 'btn btn-default')
-%hr
 = render 'form'

app/views/admin/shared/_title.haml

@@ -0,0 +1,11 @@
+- content_for :window_title do
+  %title= name
+
+.row
+  .col-sm-8
+    %h1.text-center-xs
+      = truncate(name, length: 40)
+  .col-sm-4
+    %h1.text-right.text-center-xs
+      = yield :actions
+%hr

app/views/registrar/shared/_title.haml

@@ -4,7 +4,7 @@
 .row
   .col-sm-6
     %h1.text-center-xs
-      = name
+      = truncate(name)
   .col-sm-6
     %h1.text-right.text-center-xs
       = yield :actions