Browse Source

home v2: added register block and newsletter subscription

Bachir Soussi Chiadmi 9 years ago
parent
commit
2fd09f23e9

+ 37 - 14
sites/all/modules/features/materio_home_v2/materio_home_v2.pages_default.inc

@@ -104,6 +104,29 @@ function materio_home_v2_default_page_manager_pages() {
     $display->content['new-d0ee2cb5-bc02-4ded-a907-91d2dbea37c7'] = $pane;
     $display->panels['middle'][0] = 'new-d0ee2cb5-bc02-4ded-a907-91d2dbea37c7';
     $pane = new stdClass();
+    $pane->pid = 'new-afe6b27a-ba89-4292-8f16-0a59f0e9d944';
+    $pane->panel = 'middle';
+    $pane->type = 'block';
+    $pane->subtype = 'materio_user-user_register';
+    $pane->shown = TRUE;
+    $pane->access = array();
+    $pane->configuration = array(
+      'override_title' => 0,
+      'override_title_text' => '',
+      'override_title_heading' => 'h2',
+    );
+    $pane->cache = array();
+    $pane->style = array(
+      'settings' => NULL,
+    );
+    $pane->css = array();
+    $pane->extras = array();
+    $pane->position = 1;
+    $pane->locks = array();
+    $pane->uuid = 'afe6b27a-ba89-4292-8f16-0a59f0e9d944';
+    $display->content['new-afe6b27a-ba89-4292-8f16-0a59f0e9d944'] = $pane;
+    $display->panels['middle'][1] = 'new-afe6b27a-ba89-4292-8f16-0a59f0e9d944';
+    $pane = new stdClass();
     $pane->pid = 'new-78b5df28-c9fd-4904-8910-aa1b96c60e35';
     $pane->panel = 'middle';
     $pane->type = 'block';
@@ -121,11 +144,11 @@ function materio_home_v2_default_page_manager_pages() {
     );
     $pane->css = array();
     $pane->extras = array();
-    $pane->position = 1;
+    $pane->position = 2;
     $pane->locks = array();
     $pane->uuid = '78b5df28-c9fd-4904-8910-aa1b96c60e35';
     $display->content['new-78b5df28-c9fd-4904-8910-aa1b96c60e35'] = $pane;
-    $display->panels['middle'][1] = 'new-78b5df28-c9fd-4904-8910-aa1b96c60e35';
+    $display->panels['middle'][2] = 'new-78b5df28-c9fd-4904-8910-aa1b96c60e35';
     $pane = new stdClass();
     $pane->pid = 'new-c0f80278-c595-4c40-bcec-11063eb6fac5';
     $pane->panel = 'middle';
@@ -153,11 +176,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'showroom',
     );
     $pane->extras = array();
-    $pane->position = 2;
+    $pane->position = 3;
     $pane->locks = array();
     $pane->uuid = 'c0f80278-c595-4c40-bcec-11063eb6fac5';
     $display->content['new-c0f80278-c595-4c40-bcec-11063eb6fac5'] = $pane;
-    $display->panels['middle'][2] = 'new-c0f80278-c595-4c40-bcec-11063eb6fac5';
+    $display->panels['middle'][3] = 'new-c0f80278-c595-4c40-bcec-11063eb6fac5';
     $pane = new stdClass();
     $pane->pid = 'new-71badc43-2232-4c2f-b454-e3be80726a22';
     $pane->panel = 'middle';
@@ -185,11 +208,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'bdd',
     );
     $pane->extras = array();
-    $pane->position = 3;
+    $pane->position = 4;
     $pane->locks = array();
     $pane->uuid = '71badc43-2232-4c2f-b454-e3be80726a22';
     $display->content['new-71badc43-2232-4c2f-b454-e3be80726a22'] = $pane;
-    $display->panels['middle'][3] = 'new-71badc43-2232-4c2f-b454-e3be80726a22';
+    $display->panels['middle'][4] = 'new-71badc43-2232-4c2f-b454-e3be80726a22';
     $pane = new stdClass();
     $pane->pid = 'new-3b6cc0fd-a06a-403a-841e-404ea57fe234';
     $pane->panel = 'middle';
@@ -211,11 +234,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'news-panel',
     );
     $pane->extras = array();
-    $pane->position = 4;
+    $pane->position = 5;
     $pane->locks = array();
     $pane->uuid = '3b6cc0fd-a06a-403a-841e-404ea57fe234';
     $display->content['new-3b6cc0fd-a06a-403a-841e-404ea57fe234'] = $pane;
-    $display->panels['middle'][4] = 'new-3b6cc0fd-a06a-403a-841e-404ea57fe234';
+    $display->panels['middle'][5] = 'new-3b6cc0fd-a06a-403a-841e-404ea57fe234';
     $pane = new stdClass();
     $pane->pid = 'new-e5d39cf0-472b-4779-9d31-a1548fe86bc7';
     $pane->panel = 'middle';
@@ -243,11 +266,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'formations',
     );
     $pane->extras = array();
-    $pane->position = 5;
+    $pane->position = 6;
     $pane->locks = array();
     $pane->uuid = 'e5d39cf0-472b-4779-9d31-a1548fe86bc7';
     $display->content['new-e5d39cf0-472b-4779-9d31-a1548fe86bc7'] = $pane;
-    $display->panels['middle'][5] = 'new-e5d39cf0-472b-4779-9d31-a1548fe86bc7';
+    $display->panels['middle'][6] = 'new-e5d39cf0-472b-4779-9d31-a1548fe86bc7';
     $pane = new stdClass();
     $pane->pid = 'new-9718c81e-6055-4e4e-a0e5-3796d58c6cbe';
     $pane->panel = 'middle';
@@ -275,11 +298,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'services',
     );
     $pane->extras = array();
-    $pane->position = 6;
+    $pane->position = 7;
     $pane->locks = array();
     $pane->uuid = '9718c81e-6055-4e4e-a0e5-3796d58c6cbe';
     $display->content['new-9718c81e-6055-4e4e-a0e5-3796d58c6cbe'] = $pane;
-    $display->panels['middle'][6] = 'new-9718c81e-6055-4e4e-a0e5-3796d58c6cbe';
+    $display->panels['middle'][7] = 'new-9718c81e-6055-4e4e-a0e5-3796d58c6cbe';
     $pane = new stdClass();
     $pane->pid = 'new-639eb2c7-bf5d-4920-b1bb-c33d8f72a650';
     $pane->panel = 'middle';
@@ -297,11 +320,11 @@ function materio_home_v2_default_page_manager_pages() {
       'css_class' => 'publication',
     );
     $pane->extras = array();
-    $pane->position = 7;
+    $pane->position = 8;
     $pane->locks = array();
     $pane->uuid = '639eb2c7-bf5d-4920-b1bb-c33d8f72a650';
     $display->content['new-639eb2c7-bf5d-4920-b1bb-c33d8f72a650'] = $pane;
-    $display->panels['middle'][7] = 'new-639eb2c7-bf5d-4920-b1bb-c33d8f72a650';
+    $display->panels['middle'][8] = 'new-639eb2c7-bf5d-4920-b1bb-c33d8f72a650';
   $display->hide_title = PANELS_TITLE_NONE;
   $display->title_pane = '0';
   $handler->conf['display'] = $display;

+ 23 - 0
sites/all/modules/features/materio_home_v2/materio_home_v2.panels_default.inc

@@ -65,6 +65,29 @@ function materio_home_v2_default_panels_mini() {
     $display->content['new-9cd76d41-bb30-42d9-9209-cdf495d97281'] = $pane;
     $display->panels['bottom'][0] = 'new-9cd76d41-bb30-42d9-9209-cdf495d97281';
     $pane = new stdClass();
+    $pane->pid = 'new-dd7b8b21-bef6-4816-8f42-0165785fe751';
+    $pane->panel = 'bottom';
+    $pane->type = 'block';
+    $pane->subtype = 'simplenews-0';
+    $pane->shown = TRUE;
+    $pane->access = array();
+    $pane->configuration = array(
+      'override_title' => 0,
+      'override_title_text' => '',
+      'override_title_heading' => 'h2',
+    );
+    $pane->cache = array();
+    $pane->style = array(
+      'settings' => NULL,
+    );
+    $pane->css = array();
+    $pane->extras = array();
+    $pane->position = 1;
+    $pane->locks = array();
+    $pane->uuid = 'dd7b8b21-bef6-4816-8f42-0165785fe751';
+    $display->content['new-dd7b8b21-bef6-4816-8f42-0165785fe751'] = $pane;
+    $display->panels['bottom'][1] = 'new-dd7b8b21-bef6-4816-8f42-0165785fe751';
+    $pane = new stdClass();
     $pane->pid = 'new-04d42fc5-b2de-441b-aaff-3becac366c74';
     $pane->panel = 'left';
     $pane->type = 'views_panes';

File diff suppressed because it is too large
+ 104 - 198
sites/all/themes/gui/materiobasetheme/css/styles.css


+ 2 - 2
sites/all/themes/gui/materiobasetheme/js/script.js

@@ -81,7 +81,7 @@
       checkIE();
       initHistoryNav();
 
-      if(_isFrontNotLogged)
+      if(_isFrontNotLogged && !_isFrontHomeV2)
         initHome();
 
       if(_isFrontHomeV2)
@@ -1585,7 +1585,7 @@
 
     function hideLabelsFromRegisterForm () {
       var $this, id,label, description;
-      $('input.form-text', '#block-user-login, #block-materio-user-user-register, , #block-materio-user-user-createaccount').each(function(i) {
+      $('input.form-text', '#block-user-login, #block-materio-user-user-register, .pane-materio-user-user-register, #block-materio-user-user-createaccount').each(function(i) {
         $this = $(this);
         id = $this.attr('id');
         label = $('label[for='+id+']').hide().text();

+ 1 - 0
sites/all/themes/gui/materiobasetheme/scss/layout.scss

@@ -170,6 +170,7 @@ $header-z-index:1000;
 
 #footer{
   @include padded;
+  padding-top: 2em;
 }
 
 /** NIVEAU 3 */

+ 157 - 10
sites/all/themes/gui/materiobasetheme/scss/styles.scss

@@ -2920,6 +2920,133 @@ body.home-v2{
         display:none;
       }
     }
+
+    &.pane-materio-user-user-register{
+      padding: 2em 0;
+      background: transparent url('../img/register-block.png') no-repeat 100% 90%;
+      text-align: center;
+      .pane-content{
+        @include inlineblock(); text-align: left;
+      }
+
+      h2, h3{@include fs900; @include italic; padding:5px 0; margin: 0; line-height: 1; @include inlineblock(); vertical-align: middle;}
+      h2{@include fs24;} h3{@include fs16;}
+
+      form{margin: 0 1em; padding:0px; @include inlineblock(); vertical-align: middle;}
+
+      .form-item, .form-wrapper{
+        margin: 0; position:relative; @include inlineblock();vertical-align: middle;
+      }
+
+      #edit-account{margin-right:5px;}
+
+      input.form-text{ @include fs12; @include rounded(5px); margin-bottom:4px;.ie8 &{margin-right:5px;}}
+      .form-item-mail input.form-text, .form-item-name input.form-text{ width:11em;}
+      .form-item-pass input.form-text{ width:7em;}
+
+      #edit-mail-check{
+        position:absolute; bottom:100%; z-index:9999; background-image: none;
+        height:auto; //width:90%;
+        padding: 5px; @include rounded(5px); margin-bottom:10px;
+        @include fs11;  background-color: #fff;
+        @include drop-shadow(0, 0, 5px, 0.6);
+        @include transition-simply-prefix(bottom 0.1s ease-out);
+
+        &.error{
+          background-color: #f3968d;
+          // border: 2px solid #f30002;
+          color:#fff;
+        }
+
+        &.ok{ display:none; }
+      }
+
+      .form-submit{
+        //border: 2px solid #69CDCF; background-color:#69CDCF; color:#FF7400; // orange/bleu
+        @include fs16; padding: 0.1em 0.6em 0.2em; @include rounded(0.3em);
+        font-weight:bold;
+        margin-bottom:4px;
+      }
+
+      .form-item-termsofservices, #edit-field-newsletter{
+        margin-bottom:0; display:block; line-height: 1;
+        &>*{ @include inlineblock; vertical-align: middle; margin: 0; }
+        label{ @include fs10; background-color: #fff; @include rounded(3px); }
+      }
+
+      #user-register-form{
+        .form-submit{
+          border: 2px solid #69CDCF; background-color:#69CDCF; color:#fff; // blanc/bleu
+          @include shadowTextBtnBlack();
+          &[disabled]{
+            background-color:#ddd; border: 2px solid #ddd;
+          }
+        }
+
+      }
+      #user-login{
+        .form-submit{
+          border: 2px solid #E6DE1C; background-color:#E6DE1C; color:#fff; // noire/jaune
+          @include shadowTextBtnBlack();
+        }
+      }
+
+      #edit-simplenews{
+        padding-top:0.5em;
+        .fieldset-description{
+          @include fs12;
+        }
+        .form-checkboxes{
+          .form-item{
+            display:block;
+            label{@include fs12;}
+          }
+        }
+      }
+
+      a.join{
+        @include inlineblock(); vertical-align: middle;
+        // display:block;
+        margin: 0 1em;
+        // width:5em;
+        @include fs16; padding: 0.1em 0.3em 0.2em; @include rounded(0.3em);
+        font-weight:bold;
+        border: 2px solid #69CDCF; background-color:#69CDCF; color:#fff; // blanc/bleu
+        @include shadowTextBtnBlack();
+        text-align: center; text-decoration: none;
+      }
+
+      @media #{$small-only}{
+        background-position: 160% 50%;
+        .form-item-mail input.form-text, .form-item-name input.form-text{ width:7em;}
+        min-height:60px; padding: 15px 0;
+        // #user-login, >h3:first-child, >h3 span{ display:none; }
+      }
+
+      .message-error{
+        color:#b94a48; @include fs12;
+      }
+
+      .modal-content &{
+        padding: 0.5em 0.5em 5em 0.5em;
+
+        width:400px;
+        background-color: #fff;
+        padding:5px;
+        @include rounded(5px);
+
+        #user-register-form{
+          // hide honeypot field, because drupal.attachbehavior() doesn't work
+          div.homepage-textfield{display:none;}
+
+          .description{
+            @include fs12;
+          }
+        }
+
+      }
+    }
+
     &.showroom{
       @include shaddowed();
       height:450px;
@@ -2980,7 +3107,7 @@ body.home-v2{
         transform: scale(0.8);
         position: absolute;
         bottom:-120px;
-        right: -80px;
+        right: -20px;
         z-index:10;
       }
     }
@@ -3140,9 +3267,29 @@ body.home-v2{
       }
     }
 
-    .view-news-home-v2{
-      .views-row{@include inlineblock();}
+    .pane-simplenews-0{
+      p{display:none;}
+      #edit-newsletters{
+        margin:0 0 0.5em 0;
+        .form-item{
+          @include inlineblock(); margin-right: 1em;
+          label, input{vertical-align: middle;}
+        }
+
+      }
+
+      .form-item-mail{
+        @include inlineblock(); margin:0;
+        label, input{@include inlineblock(); margin-right: 1em;}
+      }
+
+      #edit-subscribe, #edit-unsubscribe{@include inlineblock();}
     }
+
+
+    // .view-news-home-v2{
+    //   .views-row{@include inlineblock();}
+    // }
     .node-simplenews{
       @include rounded(5px); background-color: #FFF;
       @include drop-shadow(0, 0, 5px, 0.2);
@@ -3164,13 +3311,13 @@ body.home-v2{
     }
 
     //deco
-    // &:after{
-    //   content:url("../img/point.png");
-    //   //transform: scale(1);
-    //   position: absolute;
-    //   bottom:50px;
-    //   right: 0px;
-    // }
+    &:after{
+      content:url("../img/point.png");
+      //transform: scale(1);
+      position: absolute;
+      bottom:20px;
+      right: 10px;
+    }
   }
 
 

Some files were not shown because too many files changed in this diff