diff --git a/composer.json b/composer.json index a5c40e52980fdfcba921063b8ce524b7d26b37f7..9380a882502c07c382403ea592b1352a4f5a5d40 100644 --- a/composer.json +++ b/composer.json @@ -148,6 +148,7 @@ "drupal/varbase_heroslider_media": "4.x-dev", "drupal/varbase_carousels": "4.x-dev", "drupal/varbase_total_control": "1.x-dev", + "drupal/default_content": "1.0-alpha6", "mkalkbrenner/php-htmldiff-advanced": "~0.0.8", "vardot/dropzone": "4.3.0.1", "vardot/blazy": "1.8.2.1", diff --git a/configbit/default.components.varbase.bit.yml b/configbit/default.components.varbase.bit.yml index fd0b6606d6fa4e3077b162cdf44fc610bb51defd..c9dc01797a6ab7cb21af3920ebef1d77e4d19e87 100644 --- a/configbit/default.components.varbase.bit.yml +++ b/configbit/default.components.varbase.bit.yml @@ -19,5 +19,6 @@ config_bit: - varbase_webform - varbase_page - varbase_landing + - varbase_default_content # Enable listed modules in order at this installation step. - libraries diff --git a/drupal-org.make b/drupal-org.make index 493e14342d5cd921d13087d1da981ff634219c17..a87d5e8a3bd361ee5fd849af0d236c75a0516fb1 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -489,6 +489,9 @@ projects[varbase_bootstrap_paragraphs][version] = 4.x-dev projects[varbase_total_control][type] = module projects[varbase_total_control][version] = 1.x-dev +projects[default_content][type] = module +projects[default_content][version] = 1.0-alpha6 + ;;;;;;;;;;;;;;;;;;;;; ;; Libraries ;;;;;;;;;;;;;;;;;;;;; diff --git a/modules/varbase_features/varbase_default_content/config/install/block.block.copyright.yml b/modules/varbase_features/varbase_default_content/config/install/block.block.copyright.yml new file mode 100644 index 0000000000000000000000000000000000000000..31563702b7675e262256179d954432eed09a0bd9 --- /dev/null +++ b/modules/varbase_features/varbase_default_content/config/install/block.block.copyright.yml @@ -0,0 +1,29 @@ +langcode: en +status: true +dependencies: + content: + - 'block_content:basic:b858d97d-eaa5-4cfe-af6f-b92c21bbca95' + module: + - block_class + - block_content + theme: + - vartheme +third_party_settings: + block_class: + classes: '' +id: copyright +theme: vartheme +region: footer +weight: -5 +provider: null +plugin: 'block_content:b858d97d-eaa5-4cfe-af6f-b92c21bbca95' +settings: + id: 'block_content:b858d97d-eaa5-4cfe-af6f-b92c21bbca95' + label: Copyright + provider: block_content + label_display: '0' + status: true + info: '' + view_mode: full +visibility: { } + diff --git a/modules/varbase_features/varbase_default_content/content/block_content/b858d97d-eaa5-4cfe-af6f-b92c21bbca95.json b/modules/varbase_features/varbase_default_content/content/block_content/b858d97d-eaa5-4cfe-af6f-b92c21bbca95.json new file mode 100644 index 0000000000000000000000000000000000000000..aa07865935a1c75ed5ac19bf396b46a3c34ed113 --- /dev/null +++ b/modules/varbase_features/varbase_default_content/content/block_content/b858d97d-eaa5-4cfe-af6f-b92c21bbca95.json @@ -0,0 +1,104 @@ +{ + "_links": { + "self": { + "href": "http:\/\/default\/block\/1?_format=hal_json" + }, + "type": { + "href": "http:\/\/drupal.org\/rest\/type\/block_content\/basic" + }, + "http:\/\/drupal.org\/rest\/relation\/block_content\/basic\/revision_user": [ + { + "href": "http:\/\/default\/user\/1?_format=hal_json" + } + ] + }, + "id": [ + { + "value": 1 + } + ], + "uuid": [ + { + "value": "b858d97d-eaa5-4cfe-af6f-b92c21bbca95" + } + ], + "revision_id": [ + { + "value": 1 + } + ], + "langcode": [ + { + "value": "en", + "lang": "en" + } + ], + "type": [ + { + "target_id": "basic" + } + ], + "info": [ + { + "value": "Copyright", + "lang": "en" + } + ], + "revision_log": [ + { + "value": "Created new Basic block" + } + ], + "changed": [ + { + "value": 1505910672 + } + ], + "revision_created": [ + { + "value": 1505910672 + } + ], + "_embedded": { + "http:\/\/drupal.org\/rest\/relation\/block_content\/basic\/revision_user": [ + { + "_links": { + "self": { + "href": "http:\/\/default\/user\/1?_format=hal_json" + }, + "type": { + "href": "http:\/\/drupal.org\/rest\/type\/user\/user" + } + }, + "uuid": [ + { + "value": "3b28e05b-32ba-45b4-9058-bd07fbeb9a0d" + } + ] + } + ] + }, + "revision_translation_affected": [ + { + "value": true, + "lang": "en" + } + ], + "default_langcode": [ + { + "value": true, + "lang": "en" + } + ], + "metatag": [ + null + ], + "body": [ + { + "value": "Powered by <a href=\"https:\/\/www.vardot.com\/?utm_source=varbase&utm_campaign=varbase%20default%20links\">Vardot<\/a>. Enjoy the free software, or <a href=\"https:\/\/www.vardot.com\/form\/get-support-varbase?utm_source=varbase&utm_campaign=varbase%20default%20links\">get a quote<\/a> for enterprise support and fully functional websites.", + "format": "code_html", + "summary": "", + "lang": "en" + } + ] +} \ No newline at end of file diff --git a/modules/varbase_features/varbase_default_content/content/menu_link_content/2e776555-717a-40ae-9128-1bb0503f902c.json b/modules/varbase_features/varbase_default_content/content/menu_link_content/2e776555-717a-40ae-9128-1bb0503f902c.json new file mode 100644 index 0000000000000000000000000000000000000000..7ad6fffa0eb508af84d9bd45e5fda528634d72f4 --- /dev/null +++ b/modules/varbase_features/varbase_default_content/content/menu_link_content/2e776555-717a-40ae-9128-1bb0503f902c.json @@ -0,0 +1,89 @@ +{ + "_links": { + "self": { + "href": "http:\/\/default\/admin\/structure\/menu\/item\/6\/edit?_format=hal_json" + }, + "type": { + "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content" + } + }, + "id": [ + { + "value": 6 + } + ], + "uuid": [ + { + "value": "2e776555-717a-40ae-9128-1bb0503f902c" + } + ], + "langcode": [ + { + "value": "en", + "lang": "en" + } + ], + "bundle": [ + { + "value": "menu_link_content" + } + ], + "title": [ + { + "value": "Get Professional Support", + "lang": "en" + } + ], + "menu_name": [ + { + "value": "footer" + } + ], + "link": [ + { + "uri": "https:\/\/www.vardot.com\/form\/get-support-varbase?utm_source=varbase&utm_campaign=varbase%20default%20links", + "title": "", + "options": [] + } + ], + "external": [ + { + "value": false + } + ], + "rediscover": [ + { + "value": false + } + ], + "weight": [ + { + "value": 0 + } + ], + "expanded": [ + { + "value": false + } + ], + "enabled": [ + { + "value": true + } + ], + "changed": [ + { + "value": 1505909625, + "lang": "en" + } + ], + "default_langcode": [ + { + "value": true, + "lang": "en" + } + ], + "metatag": [ + null + ] +} \ No newline at end of file diff --git a/modules/varbase_features/varbase_default_content/content/menu_link_content/578d1d01-9ff2-4e3a-8692-9b1d240d93c9.json b/modules/varbase_features/varbase_default_content/content/menu_link_content/578d1d01-9ff2-4e3a-8692-9b1d240d93c9.json new file mode 100644 index 0000000000000000000000000000000000000000..14096360743145898278ae12c501324fd992c0e2 --- /dev/null +++ b/modules/varbase_features/varbase_default_content/content/menu_link_content/578d1d01-9ff2-4e3a-8692-9b1d240d93c9.json @@ -0,0 +1,89 @@ +{ + "_links": { + "self": { + "href": "http:\/\/default\/admin\/structure\/menu\/item\/2\/edit?_format=hal_json" + }, + "type": { + "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content" + } + }, + "id": [ + { + "value": 2 + } + ], + "uuid": [ + { + "value": "578d1d01-9ff2-4e3a-8692-9b1d240d93c9" + } + ], + "langcode": [ + { + "value": "en", + "lang": "en" + } + ], + "bundle": [ + { + "value": "menu_link_content" + } + ], + "title": [ + { + "value": "About Varbase", + "lang": "en" + } + ], + "menu_name": [ + { + "value": "main" + } + ], + "link": [ + { + "uri": "https:\/\/www.vardot.com\/products-services\/product-info\/varbase-enterprise-website-platform??utm_source=varbase&utm_campaign=varbase%20default%20links", + "title": "", + "options": [] + } + ], + "external": [ + { + "value": false + } + ], + "rediscover": [ + { + "value": false + } + ], + "weight": [ + { + "value": -49 + } + ], + "expanded": [ + { + "value": false + } + ], + "enabled": [ + { + "value": true + } + ], + "changed": [ + { + "value": 1505909055, + "lang": "en" + } + ], + "default_langcode": [ + { + "value": true, + "lang": "en" + } + ], + "metatag": [ + null + ] +} \ No newline at end of file diff --git a/modules/varbase_features/varbase_default_content/content/menu_link_content/605e9416-aac7-4076-b477-78bc4d786ec1.json b/modules/varbase_features/varbase_default_content/content/menu_link_content/605e9416-aac7-4076-b477-78bc4d786ec1.json new file mode 100644 index 0000000000000000000000000000000000000000..8ade519677dcb932c0a3681235f51051371851a2 --- /dev/null +++ b/modules/varbase_features/varbase_default_content/content/menu_link_content/605e9416-aac7-4076-b477-78bc4d786ec1.json @@ -0,0 +1,89 @@ +{ + "_links": { + "self": { + "href": "http:\/\/default\/admin\/structure\/menu\/item\/1\/edit?_format=hal_json" + }, + "type": { + "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content" + } + }, + "id": [ + { + "value": 1 + } + ], + "uuid": [ + { + "value": "605e9416-aac7-4076-b477-78bc4d786ec1" + } + ], + "langcode": [ + { + "value": "en", + "lang": "en" + } + ], + "bundle": [ + { + "value": "menu_link_content" + } + ], + "title": [ + { + "value": "Home", + "lang": "en" + } + ], + "menu_name": [ + { + "value": "main" + } + ], + "link": [ + { + "uri": "internal:\/", + "title": "", + "options": [] + } + ], + "external": [ + { + "value": false + } + ], + "rediscover": [ + { + "value": true + } + ], + "weight": [ + { + "value": -50 + } + ], + "expanded": [ + { + "value": false + } + ], + "enabled": [ + { + "value": true + } + ], + "changed": [ + { + "value": 1505909055, + "lang": "en" + } + ], + "default_langcode": [ + { + "value": true, + "lang": "en" + } + ], + "metatag": [ + null + ] +} \ No newline at end of file diff --git a/modules/varbase_features/varbase_default_content/content/menu_link_content/99c9e313-c21e-4c02-b850-2c1ee03c1931.json b/modules/varbase_features/varbase_default_content/content/menu_link_content/99c9e313-c21e-4c02-b850-2c1ee03c1931.json new file mode 100644 index 0000000000000000000000000000000000000000..e407031668443067b22d6cad451cb248396cd3d5 --- /dev/null +++ b/modules/varbase_features/varbase_default_content/content/menu_link_content/99c9e313-c21e-4c02-b850-2c1ee03c1931.json @@ -0,0 +1,89 @@ +{ + "_links": { + "self": { + "href": "http:\/\/default\/admin\/structure\/menu\/item\/4\/edit?_format=hal_json" + }, + "type": { + "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content" + } + }, + "id": [ + { + "value": 4 + } + ], + "uuid": [ + { + "value": "99c9e313-c21e-4c02-b850-2c1ee03c1931" + } + ], + "langcode": [ + { + "value": "en", + "lang": "en" + } + ], + "bundle": [ + { + "value": "menu_link_content" + } + ], + "title": [ + { + "value": "Documentation", + "lang": "en" + } + ], + "menu_name": [ + { + "value": "footer" + } + ], + "link": [ + { + "uri": "https:\/\/docs.varbase.vardot.com\/?utm_source=varbase&utm_campaign=varbase%20default%20links", + "title": "", + "options": [] + } + ], + "external": [ + { + "value": false + } + ], + "rediscover": [ + { + "value": false + } + ], + "weight": [ + { + "value": 0 + } + ], + "expanded": [ + { + "value": false + } + ], + "enabled": [ + { + "value": true + } + ], + "changed": [ + { + "value": 1505909579, + "lang": "en" + } + ], + "default_langcode": [ + { + "value": true, + "lang": "en" + } + ], + "metatag": [ + null + ] +} \ No newline at end of file diff --git a/modules/varbase_features/varbase_default_content/content/menu_link_content/b446aefb-7b73-40af-9f03-5e466dacc4f9.json b/modules/varbase_features/varbase_default_content/content/menu_link_content/b446aefb-7b73-40af-9f03-5e466dacc4f9.json new file mode 100644 index 0000000000000000000000000000000000000000..b1c039a8c3e619fb488da4fe80b28b8e8c513c46 --- /dev/null +++ b/modules/varbase_features/varbase_default_content/content/menu_link_content/b446aefb-7b73-40af-9f03-5e466dacc4f9.json @@ -0,0 +1,89 @@ +{ + "_links": { + "self": { + "href": "http:\/\/default\/admin\/structure\/menu\/item\/3\/edit?_format=hal_json" + }, + "type": { + "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content" + } + }, + "id": [ + { + "value": 3 + } + ], + "uuid": [ + { + "value": "b446aefb-7b73-40af-9f03-5e466dacc4f9" + } + ], + "langcode": [ + { + "value": "en", + "lang": "en" + } + ], + "bundle": [ + { + "value": "menu_link_content" + } + ], + "title": [ + { + "value": "Contact Us", + "lang": "en" + } + ], + "menu_name": [ + { + "value": "main" + } + ], + "link": [ + { + "uri": "internal:\/form\/contact", + "title": "", + "options": [] + } + ], + "external": [ + { + "value": false + } + ], + "rediscover": [ + { + "value": true + } + ], + "weight": [ + { + "value": -48 + } + ], + "expanded": [ + { + "value": false + } + ], + "enabled": [ + { + "value": true + } + ], + "changed": [ + { + "value": 1505909055, + "lang": "en" + } + ], + "default_langcode": [ + { + "value": true, + "lang": "en" + } + ], + "metatag": [ + null + ] +} \ No newline at end of file diff --git a/modules/varbase_features/varbase_default_content/content/menu_link_content/e519d077-28c4-4428-97da-894e21295384.json b/modules/varbase_features/varbase_default_content/content/menu_link_content/e519d077-28c4-4428-97da-894e21295384.json new file mode 100644 index 0000000000000000000000000000000000000000..b366bafabec15fa129c2b50b867c2e223b7f2d0c --- /dev/null +++ b/modules/varbase_features/varbase_default_content/content/menu_link_content/e519d077-28c4-4428-97da-894e21295384.json @@ -0,0 +1,89 @@ +{ + "_links": { + "self": { + "href": "http:\/\/default\/admin\/structure\/menu\/item\/5\/edit?_format=hal_json" + }, + "type": { + "href": "http:\/\/drupal.org\/rest\/type\/menu_link_content\/menu_link_content" + } + }, + "id": [ + { + "value": 5 + } + ], + "uuid": [ + { + "value": "e519d077-28c4-4428-97da-894e21295384" + } + ], + "langcode": [ + { + "value": "en", + "lang": "en" + } + ], + "bundle": [ + { + "value": "menu_link_content" + } + ], + "title": [ + { + "value": "Community Support", + "lang": "en" + } + ], + "menu_name": [ + { + "value": "footer" + } + ], + "link": [ + { + "uri": "https:\/\/www.drupal.org\/project\/issues\/varbase", + "title": "", + "options": [] + } + ], + "external": [ + { + "value": false + } + ], + "rediscover": [ + { + "value": false + } + ], + "weight": [ + { + "value": 0 + } + ], + "expanded": [ + { + "value": false + } + ], + "enabled": [ + { + "value": true + } + ], + "changed": [ + { + "value": 1505909596, + "lang": "en" + } + ], + "default_langcode": [ + { + "value": true, + "lang": "en" + } + ], + "metatag": [ + null + ] +} \ No newline at end of file diff --git a/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml b/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml new file mode 100644 index 0000000000000000000000000000000000000000..8055d3839d5b2a708de5cf5f18252ffccb3f9535 --- /dev/null +++ b/modules/varbase_features/varbase_default_content/varbase_default_content.info.yml @@ -0,0 +1,8 @@ +name: 'Varbase default content' +type: module +hidden: TRUE +description: 'Varbase default content' +package: Web services +core: 8.x +dependencies: + - default_content diff --git a/themes/vartheme/css/base/vartheme.base.css b/themes/vartheme/css/base/vartheme.base.css index 42db3ca3eab9e9184fdef38d606494b4cb2f2ede..24fa69f052d3d820a07894bf5a3ae9e99429d1d5 100644 --- a/themes/vartheme/css/base/vartheme.base.css +++ b/themes/vartheme/css/base/vartheme.base.css @@ -612,4 +612,28 @@ img { .maintenance-page #page { text-align: center; } +.footer-wrapper { + background-color: #f2f2f2; +} +.footer-wrapper .footer { + border: 0; + padding-top: 0; + padding-bottom: 0; +} +.footer-wrapper .footer #block-copyright { + float: left; + padding: 17px 0 17px 0; + font-size: 12px; +} +.footer-wrapper .footer #block-copyright > div { + padding: 14px 0 10px 0; +} +.footer-wrapper .footer ul.nav { + float: right; + padding: 17px 0 17px 0; +} +.footer-wrapper .footer ul.nav li { + display: inline-block; + list-style: none; +} /*# sourceMappingURL=vartheme.base.css.map */ diff --git a/themes/vartheme/less/base/vartheme.base.less b/themes/vartheme/less/base/vartheme.base.less index 4449e2a4e0614d93ce2de1eac2a59fd120ee5b94..27a4037a9fa262e9fcb8634844a47feecff5df01 100644 --- a/themes/vartheme/less/base/vartheme.base.less +++ b/themes/vartheme/less/base/vartheme.base.less @@ -798,3 +798,33 @@ img { text-align: center; } } + +.footer-wrapper { + background-color: #f2f2f2; + .footer { + border: 0; + padding-top: 0; + padding-bottom: 0; + + #block-copyright { + float: left; + padding: 17px 0 17px 0; + font-size: 12px; + + > div { + padding: 14px 0 10px 0; + } + } + + ul.nav { + float: right; + padding: 17px 0 17px 0; + + li { + display: inline-block; + list-style: none; + } + } + } +} + diff --git a/themes/vartheme/templates/system/page.html.twig b/themes/vartheme/templates/system/page.html.twig index f128f2ecf2d9f3177b6d273cd9693808eebd4ba5..53132a1f6e8eede3c84b036db16a65460e76d52c 100755 --- a/themes/vartheme/templates/system/page.html.twig +++ b/themes/vartheme/templates/system/page.html.twig @@ -88,7 +88,7 @@ {# Navigation (collapsible) #} {% if page.navigation_collapsible %} - <div id="navbar-collapse" class="navbar-collapse collapse"> + <div id="navbar-collapse" class="navbar-collapse collapse navbar-right"> {{ page.navigation_collapsible }} </div> {% endif %} @@ -205,8 +205,11 @@ {% if page.footer %} {% block footer %} - <footer class="footer {{ container }}" role="contentinfo"> - {{ page.footer }} - </footer> + <div class="footer-wrapper"> + <footer class="footer {{ container }}" role="contentinfo"> + {{ page.footer }} + </footer> + </div> {% endblock %} {% endif %} +