diff --git a/app/views/layouts/2020.html.erb b/app/views/layouts/2020.html.erb deleted file mode 100644 index d51815dc..00000000 --- a/app/views/layouts/2020.html.erb +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - <%= favicon_link_tag 'https://www.ualberta.ca/favicon.svg' %> - <%= javascript_pack_tag '2020main' %> - <%= stylesheet_pack_tag '2020main' %> - - - - - - - - <%= stylesheet_link_tag comfy_cms_render_css_path(@cms_site.id, @cms_layout.identifier) %> - - <% if content_for(:title) %> - <%= yield(:title) %> - UofA Library - <% elsif @cms_page %> - <%= @cms_page.label %> - UofA Library - <% else %> - University of Alberta Library - <% end %> - - - - - - - - <%= yield %> - - - diff --git a/app/views/layouts/2020_bootstrap_v5.html.erb b/app/views/layouts/2020_bootstrap_v5.html.erb deleted file mode 100644 index e49a589e..00000000 --- a/app/views/layouts/2020_bootstrap_v5.html.erb +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - <%= favicon_link_tag 'https://www.ualberta.ca/favicon.svg' %> - <%= javascript_pack_tag '2020main-bootstrap-v5' %> - <%= stylesheet_pack_tag '2020main-bootstrap-v5' %> - - - - - - - - <%= stylesheet_link_tag comfy_cms_render_css_path(@cms_site.id, @cms_layout.identifier) %> - - <% if content_for(:title) %> - <%= yield(:title) %> - UofA Library - <% elsif @cms_page %> - <%= @cms_page.label %> - UofA Library - <% else %> - University of Alberta Library - <% end %> - - - - - - - - <%= yield %> - - - diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 946bd081..9b8cb673 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,178 +1,250 @@ - - + - - - - - - - - - - <% if content_for(:title) %> - <%= yield(:title) %> - UofA Libraries - <% elsif @cms_page %> - <%= @cms_page.label %> - UofA Libraries - <% else %> - University of Alberta Libraries - <% end %> - - - - - - - - - <%= favicon_link_tag 'https://www.ualberta.ca/favicon.svg' %> - <%= javascript_pack_tag '2020main' %> - <%= stylesheet_pack_tag '2020main' %> - - - - - - <% if content_for(:title) %> - <%= yield(:title) %> - UofA Library - <% elsif @cms_page %> - <%= @cms_page.label %> - UofA Library - <% else %> - University of Alberta Library - <% end %> - + + + + <% if content_for(:title) %> + <%= yield(:title) %> + <% elsif @cms_page %> + <%= @cms_page.label %> + <% else %> + Library + <% end %> + + + + + + + + + + + + + + <%= stylesheet_link_tag comfy_cms_render_css_path(@cms_site.id, @cms_layout.identifier) %> + <%= javascript_include_tag comfy_cms_render_js_path(@cms_site.id, @cms_layout.identifier) %> - - + + + + + + + + + + + + +
+ + + This site is licensed under a
Creative Commons License
Website Privacy Policy +
+ + diff --git a/app/views/layouts/basic.html.erb b/app/views/layouts/basic.html.erb index 59f276be..fa075df5 100644 --- a/app/views/layouts/basic.html.erb +++ b/app/views/layouts/basic.html.erb @@ -21,38 +21,21 @@ - - - - - + <%= stylesheet_link_tag comfy_cms_render_css_path(@cms_site.id, @cms_layout.identifier) %> <%= javascript_include_tag comfy_cms_render_js_path(@cms_site.id, @cms_layout.identifier) %> - - - + + + <%= yield %> diff --git a/app/views/layouts/cms.html.erb b/app/views/layouts/cms.html.erb deleted file mode 100644 index 7621aeaf..00000000 --- a/app/views/layouts/cms.html.erb +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - <% if content_for(:title) %> - <%= yield(:title) %> - UofA Libraries - <% elsif @cms_page %> - <%= @cms_page.label %> - UofA Libraries - <% else %> - University of Alberta Libraries - <% end %> - - <%= favicon_link_tag 'https://www.ualberta.ca/favicon.svg' %> - - - <%= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic|Abel" %> - <%= javascript_pack_tag 'application' %> - <%= stylesheet_pack_tag 'application' %> - - - - <%= csrf_meta_tags %> - <%= content_for(:head) %> - - - - - - -
- <%= render :partial => 'shared/header_navbar' %> - - -
- <%= yield %> -
- - <%= render :partial => 'shared/footer' %> - - diff --git a/app/views/layouts/cms_french.html.erb b/app/views/layouts/cms_french.html.erb deleted file mode 100644 index 89a2af7b..00000000 --- a/app/views/layouts/cms_french.html.erb +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - <% if content_for(:title) %> - <%= yield(:title) %> - Bibliothèques - <% elsif @cms_page %> - <%= @cms_page.label %> - Bibliothèques - <% else %> - Bibliothèques de l'Université de l'Alberta - <% end %> - - - - - - <%= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic|Abel" %> - <%= javascript_pack_tag 'application' %> - <%= stylesheet_pack_tag 'application' %> - - - - <%= csrf_meta_tags %> - <%= content_for(:head) %> - - - - - - -
- <%= render :partial => 'shared/header_navbar_french' %> - - -
- <%= yield %> -
- - <%= render :partial => 'shared/footer_french' %> - - diff --git a/app/views/layouts/french.html.erb b/app/views/layouts/french.html.erb deleted file mode 100644 index 9b0f3763..00000000 --- a/app/views/layouts/french.html.erb +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - Bibliothèques de l'Université de l'Alberta - <%= favicon_link_tag 'https://www.ualberta.ca/favicon.svg' %> - - - - <%= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic|Abel" %> - <%= javascript_pack_tag 'application' %> - <%= stylesheet_pack_tag 'application' %> - - - <%= csrf_meta_tags %> - - - - - -
- - - - -<%= yield %> - - - <%= render :partial => 'shared/footer_french' %> - - - - - diff --git a/app/views/layouts/giving.html.erb b/app/views/layouts/giving.html.erb deleted file mode 100644 index ff2fecff..00000000 --- a/app/views/layouts/giving.html.erb +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - <%= favicon_link_tag 'https://www.ualberta.ca/favicon.svg' %> - - - - <%= stylesheet_link_tag comfy_cms_render_css_path(@cms_site.id, @cms_layout.identifier) %> - - - - <% if content_for(:title) %> - <%= yield(:title) %> - UofA Libraries - <% elsif @cms_page %> - <%= @cms_page.label %> - UofA Libraries - <% else %> - University of Alberta Libraries - <% end %> - - - - - <%= yield %> - - - - - - - - diff --git a/app/views/layouts/home.html.erb b/app/views/layouts/home.html.erb deleted file mode 100644 index c31a2958..00000000 --- a/app/views/layouts/home.html.erb +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - University of Alberta Libraries - <%= favicon_link_tag 'https://www.ualberta.ca/favicon.svg' %> - - - - <%= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic|Abel" %> - <%= javascript_pack_tag 'application' %> - <%= stylesheet_pack_tag 'application' %> - - - <%= csrf_meta_tags %> - - - - - -
- - - - - -<%= yield %> - - - <%= render :partial => 'shared/footer' %> - - - - diff --git a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/content.html b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/content.html index 93517079..c48fd8af 100644 --- a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/content.html +++ b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/content.html @@ -1,134 +1,134 @@ [attributes] --- label: French Main -app_layout: '2020' +app_layout: basic position: 3 [content] - - - + + + [js] [css] -@import "/cms-css/1/2020main.css" +@import "/cms-css/1/2020main.css" diff --git a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-one-column-sidebar/content.html b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-one-column-sidebar/content.html index 38ff62d3..2ebd9685 100644 --- a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-one-column-sidebar/content.html +++ b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-one-column-sidebar/content.html @@ -1,19 +1,19 @@ [attributes] --- label: french-one-column-sidebar -app_layout: '2020' +app_layout: basic position: 1 [content] -

{{ cms:text title }}

-
-
{{ cms:wysiwyg content }}
- -
+

{{ cms:text title }}

+
+
{{ cms:wysiwyg content }}
+ +
[js] - + [css] - + diff --git a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-secondary-pages/content.html b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-secondary-pages/content.html index 1ee66e90..8cd1052b 100644 --- a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-secondary-pages/content.html +++ b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-secondary-pages/content.html @@ -1,17 +1,17 @@ [attributes] --- label: french-secondary-pages -app_layout: '2020' +app_layout: basic position: 15 [content] - {{ cms:wysiwyg content }} - - + {{ cms:wysiwyg content }} + + [js] - + [css] - + diff --git a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-two-equal-columns/content.html b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-two-equal-columns/content.html index 84b53189..202b1ee9 100644 --- a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-two-equal-columns/content.html +++ b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/french-two-equal-columns/content.html @@ -1,20 +1,20 @@ [attributes] --- label: french-two-equal-columns -app_layout: '2020' +app_layout: basic position: 2 [content] -

{{ cms:text title }}

-
-
{{ cms:wysiwyg content }}
-
{{ cms:wysiwyg right_column }}
-
- +

{{ cms:text title }}

+
+
{{ cms:wysiwyg content }}
+
{{ cms:wysiwyg right_column }}
+
+ [js] - + [css] - + diff --git a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/non-rich-text-french/content.html b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/non-rich-text-french/content.html index c505620e..517ba703 100644 --- a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/non-rich-text-french/content.html +++ b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/non-rich-text-french/content.html @@ -1,14 +1,14 @@ [attributes] --- label: non-rich-text-french -app_layout: '2020' +app_layout: basic position: 10 [content] -{{ cms:textarea content }} +{{ cms:textarea content }} [js] - + [css] @import "/cms-css/1/2020main.css" diff --git a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/one-column-french/content.html b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/one-column-french/content.html index 556843d5..bd649e28 100644 --- a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/one-column-french/content.html +++ b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/one-column-french/content.html @@ -1,7 +1,7 @@ [attributes] --- label: One Column French -app_layout: '2020' +app_layout: basic position: 0 [content] diff --git a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/sidebar-french/content.html b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/sidebar-french/content.html index fc5d1376..4abe8fe3 100644 --- a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/sidebar-french/content.html +++ b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/sidebar-french/content.html @@ -1,15 +1,15 @@ [attributes] --- label: Sidebar French -app_layout: '2020' +app_layout: basic position: 1 [content] -

{{ cms:text title }}

-
-
{{ cms:wysiwyg content }}
- -
+

{{ cms:text title }}

+
+
{{ cms:wysiwyg content }}
+ +
[js] diff --git a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/two-columns-french/content.html b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/two-columns-french/content.html index 8cc1ff38..1b3dd1b5 100644 --- a/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/two-columns-french/content.html +++ b/db/cms_seeds/library-cms-seeds/layouts/2020main-fr/two-columns-french/content.html @@ -1,14 +1,14 @@ [attributes] --- label: Two Columns French -app_layout: '2020' +app_layout: basic position: 2 [content] -

{{ cms:text title }}

-
-
{{ cms:wysiwyg left_column }}
-
{{ cms:wysiwyg right_column }}
+

{{ cms:text title }}

+
+
{{ cms:wysiwyg left_column }}
+
{{ cms:wysiwyg right_column }}
[js] diff --git a/db/cms_seeds/library-cms-seeds/layouts/2020main/content.html b/db/cms_seeds/library-cms-seeds/layouts/2020main/content.html index e2638a6a..09cecd18 100644 --- a/db/cms_seeds/library-cms-seeds/layouts/2020main/content.html +++ b/db/cms_seeds/library-cms-seeds/layouts/2020main/content.html @@ -1,502 +1,502 @@ [attributes] --- label: English Main -app_layout: '2020' +app_layout: basic position: 4 [content] -