updated pricing page

sites/all/modules/features/materio_administration/materio_administration.info

@@ -8,6 +8,10 @@ dependencies[] = admin_menu_toolbar
 dependencies[] = ctools
 dependencies[] = elysia_cron
 dependencies[] = features
+dependencies[] = login_destination
+dependencies[] = logintoboggan
+dependencies[] = logintoboggan_rules
+dependencies[] = logintoboggan_variable
 dependencies[] = materio_user
 dependencies[] = menu
 dependencies[] = role_delegation
@@ -87,6 +91,19 @@ features[variable][] = content_type_extras_title_hide_breve
 features[variable][] = content_type_extras_title_hide_company
 features[variable][] = content_type_extras_title_hide_didactique
 features[variable][] = content_type_extras_title_hide_materiau
+features[variable][] = login_destination_immediate_redirect
+features[variable][] = login_destination_preserve_destination
+features[variable][] = logintoboggan_confirm_email_at_registration
+features[variable][] = logintoboggan_immediate_login_on_register
+features[variable][] = logintoboggan_login_successful_message
+features[variable][] = logintoboggan_login_with_email
+features[variable][] = logintoboggan_minimum_password_length
+features[variable][] = logintoboggan_override_destination_parameter
+features[variable][] = logintoboggan_pre_auth_role
+features[variable][] = logintoboggan_purge_unvalidated_user_interval
+features[variable][] = logintoboggan_redirect_on_confirm
+features[variable][] = logintoboggan_redirect_on_register
+features[variable][] = logintoboggan_unified_login
 features[variable][] = title_node
 features[variable][] = title_taxonomy_term
 features[variable][] = workflow_access_priority

sites/all/modules/features/materio_administration/materio_administration.strongarm.inc

@@ -120,6 +120,97 @@ function materio_administration_strongarm() {
   $strongarm->value = 0;
   $export['content_type_extras_title_hide_materiau'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'logintoboggan_confirm_email_at_registration';
+  $strongarm->value = '0';
+  $export['logintoboggan_confirm_email_at_registration'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'logintoboggan_immediate_login_on_register';
+  $strongarm->value = 1;
+  $export['logintoboggan_immediate_login_on_register'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'logintoboggan_login_successful_message';
+  $strongarm->value = '0';
+  $export['logintoboggan_login_successful_message'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'logintoboggan_login_with_email';
+  $strongarm->value = '1';
+  $export['logintoboggan_login_with_email'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'logintoboggan_minimum_password_length';
+  $strongarm->value = '0';
+  $export['logintoboggan_minimum_password_length'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'logintoboggan_override_destination_parameter';
+  $strongarm->value = 0;
+  $export['logintoboggan_override_destination_parameter'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'logintoboggan_pre_auth_role';
+  $strongarm->value = '9';
+  $export['logintoboggan_pre_auth_role'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'logintoboggan_purge_unvalidated_user_interval';
+  $strongarm->value = '604800';
+  $export['logintoboggan_purge_unvalidated_user_interval'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'logintoboggan_redirect_on_confirm';
+  $strongarm->value = 'user/%uid/edit';
+  $export['logintoboggan_redirect_on_confirm'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'logintoboggan_redirect_on_register';
+  $strongarm->value = '';
+  $export['logintoboggan_redirect_on_register'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'logintoboggan_unified_login';
+  $strongarm->value = 0;
+  $export['logintoboggan_unified_login'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'login_destination_immediate_redirect';
+  $strongarm->value = 1;
+  $export['login_destination_immediate_redirect'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'login_destination_preserve_destination';
+  $strongarm->value = 1;
+  $export['login_destination_preserve_destination'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;

sites/all/themes/gui/materiobasetheme/js/script.js

@@ -1496,14 +1496,14 @@
     function initMembershipForm() {
 
       switch(window.location.hash){
-        case '#flocon':
+        case '#1':
           $('#edit-submitted-column-left-membership-options-1').attr('checked', 'checked');
           // $options.trigger('change');
           break;
-        case '#etoile':
+        case '#2':
           $('#edit-submitted-column-left-membership-options-2').attr('checked', 'checked');
           break;
-        case '#4etoiles':
+        case '#3':
           $('#edit-submitted-column-left-membership-options-3').attr('checked', 'checked');
           break;
         // default:

sites/all/themes/gui/materiobasetheme/scss/styles.scss

@@ -2107,11 +2107,14 @@ body.page-node-11187{
     .node-11187{
       .field-name-body{
         div.column, div.column-demi, div.column-full, div.column-auto{
-          @include inlineblock;  margin: 10px;
+          &, &:last-child{
+            @include inlineblock;  margin: 10px; float:none;
+          }
         }
         div.column{
           width:22.4%;
-          ul.list-text{ min-height:170px;}
+          ul.list-text, p.description{ min-height:170px;}
+
         }
         div.column-demi{
           width:46%;
@@ -2122,8 +2125,7 @@ body.page-node-11187{
           // ul.list-text{ min-height:110px;}
         }
         div.column-auto{
-          width:auto;
-          max-width: 98%;
+          width:auto; max-width: 98%;
         }
       }
     }
@@ -2149,12 +2151,13 @@ body.page-node-11187{
         overflow:hidden;
 
         &>*{ padding: 0 10px;}
-        img{float:left; padding: 0; }
-        h2{ text-align: left; margin: 5px 0 0; }
+        // img{float:left; padding: 0; }
+        h2{ text-align: left; margin: 5px 0 0 15px;}
         .subtitle{
-          padding: 0 0 0 1em;
+          padding: 0 0 0 15px;
           @include fs18; @include italic; @include bold; line-height:1;
         }
+
         ul{margin: 0; padding: 0 15px;}
         li{
           list-style: none; @include fs12;
@@ -2163,22 +2166,30 @@ body.page-node-11187{
             @include fs900;
           }
         }
+        .description{
+           @include fs12;
+           margin: 0; padding: 0 15px;
+        }
         .get-link{
           margin: 0; @include border-radius(0 0 5px 5px); border: 1px solid #fff; min-height: 92px;
           a{ display:block; width:100%; padding: 15px 0; color:#1A1A1A; text-decoration: none; }
         }
-        &.gratos{ .get-link{background-color: #4BA13D; } }
-        &.flocon{ .get-link{ background-color: #69CDCF; } }
-        &.etoile { .get-link{ background-color: #D476AE; } }
-        &.cinqetoiles { .get-link{ background-color: #E6DE1C; } }
-        &.ecole-de-neige{float: none};
+        .get-link{background-color: #C8C8C8; }
+        &.web{ .get-link{ background-color: #69CDCF; } }
+        &.webshowroom { .get-link{ background-color: #D476AE; } }
+        &.pack4 { .get-link{ background-color: #E6DE1C; } }
+        &.etudiants{ .get-link{background-color: #4BA13D; } };
         // &.ecole-de-neige { .list-neige{min-height:80px;} }
+        &.neutral .get-link{
+          min-height: 62px;
+          padding:15px 0;
+        }
       } // end div.column div.column-demi
 
 
       div.column{
         h2{ padding:10px 0 0; @include fs24; }
-        .subtitle{ min-height:3em; }
+        // .subtitle{ min-height:3em; }
         .get-link{
           padding: 0;
           @include fs28; text-align: center;
@@ -2200,16 +2211,16 @@ body.page-node-11187{
   // hide get free account for user already logged-in
   // hide get flocon for user already flocon (role-6)
   &.logged-in{
-    .column.gratos{.get-link{
-      cursor:auto!important;
-      a{display:none!important;}
-    }}
-    &.role-6{
-      .column.flocon{.get-link{
-        cursor:auto!important;
-        a{display:none!important;}
-      }}
-    }
+    // .column.gratos{.get-link{
+    //   cursor:auto!important;
+    //   a{display:none!important;}
+    // }}
+    // &.role-6{
+    //   .column.etudiants{.get-link{
+    //     cursor:auto!important;
+    //     a{display:none!important;}
+    //   }}
+    // }
   }
 } // princing