Visit page buttons in header

hazdik · May 23, 2018 · 8d27731 · 8d27731
1 parent 4afc00d
commit 8d27731
Show file tree

Hide file tree

Showing 13 changed files with 128 additions and 81 deletions.
diff --git a/.fontcustom-manifest.json b/.fontcustom-manifest.json
@@ -1,13 +1,14 @@
 {
   "checksum": {
-    "previous": "76158a909a15f01682c59bf93797ff7dcc006135b11c6c1005b4728aa5d60c65",
-    "current": "76158a909a15f01682c59bf93797ff7dcc006135b11c6c1005b4728aa5d60c65"
+    "previous": "a76e98698a465d2e0331eecdf54e8a0cfc15e19b18f78430498ed433629ed40d",
+    "current": "a76e98698a465d2e0331eecdf54e8a0cfc15e19b18f78430498ed433629ed40d"
   },
   "fonts": [
     "app/assets/fonts/spina/ics_spina.ttf",
     "app/assets/fonts/spina/ics_spina.svg",
     "app/assets/fonts/spina/ics_spina.woff",
-    "app/assets/fonts/spina/ics_spina.eot"
+    "app/assets/fonts/spina/ics_spina.eot",
+    "app/assets/fonts/spina/ics_spina.woff2"
   ],
   "glyphs": {
     "barchart": {
@@ -110,6 +111,10 @@
       "codepoint": 61720,
       "source": "app/assets/icons/spina/exclamation.svg"
     },
+    "export": {
+      "codepoint": 61753,
+      "source": "app/assets/icons/spina/export.svg"
+    },
     "eye": {
       "codepoint": 61721,
       "source": "app/assets/icons/spina/eye.svg"
@@ -242,6 +247,8 @@
   "options": {
     "autowidth": false,
     "config": "config/fontcustom.yml",
+    "copyright": "",
+    "css3": false,
     "css_selector": ".icon-{{glyph}}",
     "debug": false,
     "font_ascent": 448,

diff --git a/app/assets/fonts/spina/ics_spina.eot b/app/assets/fonts/spina/ics_spina.eot
diff --git a/app/assets/fonts/spina/ics_spina.svg b/app/assets/fonts/spina/ics_spina.svg
diff --git a/app/assets/fonts/spina/ics_spina.ttf b/app/assets/fonts/spina/ics_spina.ttf
diff --git a/app/assets/fonts/spina/ics_spina.woff b/app/assets/fonts/spina/ics_spina.woff
diff --git a/app/assets/fonts/spina/ics_spina.woff2 b/app/assets/fonts/spina/ics_spina.woff2
diff --git a/app/assets/icons/spina/export.svg b/app/assets/icons/spina/export.svg
diff --git a/app/assets/icons/spina/preview/ics_spina-preview.html b/app/assets/icons/spina/preview/ics_spina-preview.html
@@ -143,6 +143,7 @@
   font-family: "ics_spina";
   src: url("../../../fonts/spina/ics_spina.eot");
   src: url("../../../fonts/spina/ics_spina.eot?#iefix") format("embedded-opentype"),
+       url("../../../fonts/spina/ics_spina.woff2") format("woff2"),
        url("../../../fonts/spina/ics_spina.woff") format("woff"),
        url("../../../fonts/spina/ics_spina.ttf") format("truetype"),
        url("../../../fonts/spina/ics_spina.svg#ics_spina") format("svg");
@@ -185,6 +186,7 @@
 .icon-document:before,
 .icon-dots:before,
 .icon-exclamation:before,
+.icon-export:before,
 .icon-eye:before,
 .icon-filter:before,
 .icon-home:before,
@@ -256,6 +258,7 @@
 .icon-document:before { content: "\f116"; }
 .icon-dots:before { content: "\f117"; }
 .icon-exclamation:before { content: "\f118"; }
+.icon-export:before { content: "\f139"; }
 .icon-eye:before { content: "\f119"; }
 .icon-filter:before { content: "\f11a"; }
 .icon-home:before { content: "\f11b"; }
@@ -303,7 +306,7 @@
   <body class="characters-off">
     <div id="page" class="container">
       <header>
-        <h1>ics_spina contains 57 glyphs:</h1>
+        <h1>ics_spina contains 58 glyphs:</h1>
         <a onclick="toggleCharacters(); return false;" href="#">Toggle Preview Characters</a>
       </header>
 
@@ -633,6 +636,19 @@ <h1>ics_spina contains 57 glyphs:</h1>
         </div>
       </div>
 
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-export" class="icon-export"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-export" class="icon-export"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-export" class="icon-export"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-export" class="icon-export"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-export" class="icon-export"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-export" class="icon-export"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-export" class="icon-export"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-export" class="icon-export"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-export" class="icon-export"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-export" class="icon-export"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-export" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf139;" />
+        </div>
+      </div>
+
       <div class="glyph">
         <div class="preview-glyphs">
           <span class="step size-12"><span class="letters">Pp</span><i id="icon-eye" class="icon-eye"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-eye" class="icon-eye"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-eye" class="icon-eye"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-eye" class="icon-eye"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-eye" class="icon-eye"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-eye" class="icon-eye"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-eye" class="icon-eye"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-eye" class="icon-eye"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-eye" class="icon-eye"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-eye" class="icon-eye"></i></span>

diff --git a/app/assets/stylesheets/spina/_ics_spina.scss b/app/assets/stylesheets/spina/_ics_spina.scss
@@ -27,6 +27,7 @@
 .icon-document:before { content: "\f116"; }
 .icon-dots:before { content: "\f117"; }
 .icon-exclamation:before { content: "\f118"; }
+.icon-export:before { content: "\f139"; }
 .icon-eye:before { content: "\f119"; }
 .icon-filter:before { content: "\f11a"; }
 .icon-home:before { content: "\f11b"; }

diff --git a/app/views/layouts/spina/admin/pages.html.haml b/app/views/layouts/spina/admin/pages.html.haml
@@ -15,7 +15,11 @@
 
       = yield(:header_actions) if content_for?(:header_actions)
 
-    .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
+    .breadcrumbs
+      = render_breadcrumbs separator: '<div class="divider"></div>'
+      = link_to '/', class: 'button button-small button-hollow', target: :blank do
+        =t 'spina.preview_website'
+        %i.icon.icon-export{style: "margin-left: 4px; margin-right: 0"}
 
     %nav#secondary.tabs
       %ul

diff --git a/app/views/spina/admin/pages/_form.html.haml b/app/views/spina/admin/pages/_form.html.haml
@@ -10,18 +10,25 @@
 
 = form_for [spina, :admin, @page], html: {id: 'page_form', autocomplete: "off"} do |f|
   %header#header
-    .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
-    - unless @page.new_record?
-      - if Spina.config.locales.size > 1
-        %div{style: 'display: inline-block; margin-left: 12px; position: absolute', data: {dropdown: true}}
-          = link_to '#', class: 'button button-link button-round button-small', data: {trigger: 'dropdown', target: '#locales'} do
-            = icon('comment')
-            =t "languages.#{@locale}"
-
-          %ul#locales
-            - Spina.config.locales.each do |locale|
-              %li
-                = link_to t("languages.#{locale}"), "?locale=#{locale}", style: ('font-weight: 600' if @locale.to_s == locale.to_s)
+    .breadcrumbs
+      = render_breadcrumbs separator: '<div class="divider"></div>'
+      %span{style: 'margin-left: 10px'}
+        - unless @page.new_record?
+          - if Spina.config.locales.size > 1
+            %div{style: "display: inline-block", data: {dropdown: true}}
+              = link_to '#', class: 'button button-hollow button-small', style: 'margin-left: 0; margin-right: 0', data: {trigger: 'dropdown', target: '#locales'} do
+                = icon('comment')
+                =t "languages.#{@locale}"
+                %i.icon.icon-chevron-down{style: 'font-size: 9px; margin-right: 0'}
+
+              %ul#locales
+                - Spina.config.locales.each do |locale|
+                  %li
+                    = link_to t("languages.#{locale}"), "?locale=#{locale}", style: ('font-weight: 600' if @locale.to_s == locale.to_s)
+
+        = link_to @page.materialized_path, target: :blank, class: 'button button-hollow button-small', style: 'margin-left: 0' do
+          =t 'spina.visit_page'
+          %i.icon.icon-export{style: 'margin-left: 4px; margin-right: 0'}
 
     #header_actions
       %button.button.button-primary{type: 'submit', style: 'margin-right: 0', data: {disable_with: t('spina.pages.saving')}}

diff --git a/app/views/spina/admin/shared/_primary_navigation.html.haml b/app/views/spina/admin/shared/_primary_navigation.html.haml
@@ -19,9 +19,6 @@
 
         - Spina::Resource.order(:label).each do |resource|
           %li{class: ('active' if (@resource || @page&.resource) == resource)}= link_to resource.label, spina.admin_resource_path(resource)
-
-        %li
-          = link_to t('spina.preview_website'), spina.root_path, data: { turbolinks: false }
         %li
           = link_to '#', class: 'back-to-main-menu' do
             = icon('caret-left')

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
@@ -15,6 +15,7 @@ nl:
     delete_confirmation: "Weet je zeker dat je <strong>%{subject}</strong> wilt verwijderen?"
     login: Aanmelden
     preview_website: Bekijk je website
+    visit_page: Bekijk pagina
     search: Zoeken...
     ago: geleden
     edit_website: Bewerk je website