Pārlūkot izejas kodu

fixed login redirection from login block and improved design of this block

Bachir Soussi Chiadmi 10 gadi atpakaļ
vecāks
revīzija
3220ed8e4b

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 240 - 38
sites/all/modules/contrib/users/login_destination/login_destination.admin.inc


+ 4 - 6
sites/all/modules/contrib/users/login_destination/login_destination.info

@@ -1,13 +1,11 @@
-
 name = Login Destination
 description = Customize the destination that the user is redirected to after login.
 core = 7.x
-files[] = login_destination.module
-files[] = login_destination.admin.inc
 configure = admin/config/people/login-destination
-; Information added by drupal.org packaging script on 2012-12-18
-version = "7.x-1.1"
+
+; Information added by Drupal.org packaging script on 2015-05-11
+version = "7.x-1.1+6-dev"
 core = "7.x"
 project = "login_destination"
-datestamp = "1355853150"
+datestamp = "1431374284"
 

+ 30 - 5
sites/all/modules/contrib/users/login_destination/login_destination.install

@@ -58,6 +58,13 @@ function login_destination_schema() {
         'default' => 0,
         'description' => "The rule's weight.",
       ),
+      'enabled' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'unsigned' => TRUE,
+        'default' => 1,
+        'description' => "The rule enabled/disabled status.",
+      ),
     ),
     'primary key' => array('id'),
     'indexes' => array(
@@ -69,12 +76,13 @@ function login_destination_schema() {
 }
 
 /**
- * Implementation of hook_install().
+ * Implements hook_install().
  */
 function login_destination_install() {
-  // update the alter option of 'user/logout' to TRUE (menu_save invokes necessary hooks)
+  // Update the alter option of 'user/logout' to TRUE,
+  // (menu_save invokes necessary hooks).
   $result = db_query("SELECT mlid, menu_name FROM {menu_links} WHERE link_path = 'user/logout' OR link_path = 'user/login' OR  link_path = 'user' ORDER BY mlid ASC");
-  foreach($result as $res) {
+  foreach ($result as $res) {
     $item = menu_link_load($res->mlid);
     $item['options']['alter'] = TRUE;
     db_update('menu_links')
@@ -87,13 +95,16 @@ function login_destination_install() {
 }
 
 /**
- * Implementation of hook_uninstall().
+ * Implements hook_uninstall().
  */
 function login_destination_uninstall() {
   variable_del('login_destination_preserve_destination');
   variable_del('login_destination_profile_redirect');
 }
 
+/**
+ * Implements hook_update_N().
+ */
 function login_destination_update_7000() {
   $type = variable_get('ld_condition_type', 'always');
   $snippet = variable_get('ld_condition_snippet', '');
@@ -117,7 +128,7 @@ function login_destination_update_7000() {
 
   if ($type == 'snippet') {
     $form_state['values']['destination_type'] = 1;
-    // syntax for return value has changed.
+    // Syntax for return value has changed.
     $form_state['values']['destination'] = '<?php /* ' . $snippet . ' */ ?>';
   }
   else {
@@ -138,3 +149,17 @@ function login_destination_update_7000() {
   variable_del('ld_url_type');
   variable_del('ld_url_destination');
 }
+
+/**
+ * Implements hook_update_N().
+ */
+function login_destination_update_7001() {
+  $spec = array(
+    'type' => 'int',
+    'unsigned' => TRUE,
+    'not null' => TRUE,
+    'default' => 1,
+  );
+
+  db_add_field('login_destination', 'enabled', $spec);
+}

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 3 - 3
sites/all/modules/contrib/users/login_destination/login_destination.module


+ 0 - 13
sites/all/modules/gui/materiobasemod/materio_user.module

@@ -204,25 +204,12 @@ function materio_user_form_alter(&$form, &$form_state, $form_id) {
 
     $form['actions']['#type'] = "container";
     $form['actions']['submit']['#value'] = t('Join');
-
-    // $form['termsofservices'] = array(
-    //   '#type' => 'checkbox',
-    //   '#title' => t('I accept') .' '. l(t('the materiO terms of services'), 'node/11183'),
-    //   '#required' => true,
-    // );
-
-    // $form['#submit'][] = "materio_user_user_register_form_submit";
   }
 
   if($form_id == "user_login" ){
     // dsm($form);
 
     $form['actions']['#type'] = "container";
-    // $form['actions']['submit']['#value'] = t('Join');
-
-    // if( $_GET['q'] == 'node/11187' ){
-    //   $form['#submit'][] = "materio_user_user_login_form_submit";
-    // }
   }
 
   # https://drupal.org/comment/6293810#comment-6293810

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 189 - 153
sites/all/themes/gui/materiobasetheme/css/styles.css


+ 16 - 7
sites/all/themes/gui/materiobasetheme/scss/styles.scss

@@ -275,18 +275,27 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
           @include fs10;
         }
         // label{width:30%;}
-        input.form-text{width:150px;}
+        input.form-text{
+          width:150px; height:2em;
+        }
 
-        #edit-actions{
+        .form-actions{
           margin: 5px 0; padding: 0; background-color:transparent; text-align: right;
           input.form-submit{
-            @include fs12;
-            padding: 10px;
+            // @include fs12;
+            @include fs16; padding: 0.1em 0.6em 0.2em; @include rounded(0.3em);
+            font-weight:bold;
+            margin-bottom:4px;
+            border: 2px solid #E6DE1C; background-color:#E6DE1C; color:#fff; // noire/jaune
+            @include shadowTextBtnBlack();
           }
         }
-        div.newpass a{
-          @include fs12;
-          color:#686868;
+        div.newpass{
+          text-align: right;
+          a{
+            @include fs12;
+            color:#686868;
+          }
         }
 
         // div.register a{

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels