Browse Source

fixed printed cards

Bachir Soussi Chiadmi 8 years ago
parent
commit
62fec82217

+ 0 - 4
sites/all/modules/features/materio_bookmarks/materio_bookmarks.features.user_permission.inc

@@ -15,8 +15,6 @@ function materio_bookmarks_user_default_permissions() {
     'name' => 'flag bookmarks',
     'roles' => array(
       'Student' => 'Student',
-      'Utilisateur' => 'Utilisateur',
-      'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -28,8 +26,6 @@ function materio_bookmarks_user_default_permissions() {
     'name' => 'unflag bookmarks',
     'roles' => array(
       'Student' => 'Student',
-      'Utilisateur' => 'Utilisateur',
-      'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
       'administrator' => 'administrator',
       'root' => 'root',
     ),

+ 19 - 22
sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc

@@ -1064,7 +1064,7 @@ function materio_content_types_field_default_field_instances() {
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
-        'weight' => 0,
+        'weight' => 1,
       ),
       'homeblock' => array(
         'label' => 'above',
@@ -1152,10 +1152,9 @@ function materio_content_types_field_default_field_instances() {
       ),
       'default' => array(
         'label' => 'above',
-        'module' => 'file',
         'settings' => array(),
-        'type' => 'file_default',
-        'weight' => 10,
+        'type' => 'hidden',
+        'weight' => 8,
       ),
       'homeblock' => array(
         'label' => 'above',
@@ -1241,10 +1240,9 @@ function materio_content_types_field_default_field_instances() {
       ),
       'default' => array(
         'label' => 'inline',
-        'module' => 'text',
         'settings' => array(),
-        'type' => 'text_default',
-        'weight' => 5,
+        'type' => 'hidden',
+        'weight' => 12,
       ),
       'homeblock' => array(
         'label' => 'above',
@@ -1325,11 +1323,11 @@ function materio_content_types_field_default_field_instances() {
         'weight' => 0,
       ),
       'default' => array(
-        'label' => 'above',
+        'label' => 'hidden',
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
-        'weight' => 4,
+        'weight' => 2,
       ),
       'homeblock' => array(
         'label' => 'above',
@@ -1410,10 +1408,9 @@ function materio_content_types_field_default_field_instances() {
       ),
       'default' => array(
         'label' => 'above',
-        'module' => 'text',
         'settings' => array(),
-        'type' => 'text_default',
-        'weight' => 2,
+        'type' => 'hidden',
+        'weight' => 10,
       ),
       'homeblock' => array(
         'label' => 'above',
@@ -1497,10 +1494,9 @@ function materio_content_types_field_default_field_instances() {
       ),
       'default' => array(
         'label' => 'inline',
-        'module' => 'list',
         'settings' => array(),
-        'type' => 'list_default',
-        'weight' => 3,
+        'type' => 'hidden',
+        'weight' => 9,
       ),
       'homeblock' => array(
         'label' => 'above',
@@ -1605,7 +1601,7 @@ function materio_content_types_field_default_field_instances() {
           'use_widget_handlers' => 1,
         ),
         'type' => 'addressfield_default',
-        'weight' => 9,
+        'weight' => 6,
       ),
       'homeblock' => array(
         'label' => 'above',
@@ -1707,7 +1703,7 @@ function materio_content_types_field_default_field_instances() {
         'module' => 'email',
         'settings' => array(),
         'type' => 'email_default',
-        'weight' => 7,
+        'weight' => 4,
       ),
       'homeblock' => array(
         'label' => 'above',
@@ -1792,7 +1788,7 @@ function materio_content_types_field_default_field_instances() {
         'module' => 'cck_phone',
         'settings' => array(),
         'type' => 'global_phone_number',
-        'weight' => 8,
+        'weight' => 5,
       ),
       'homeblock' => array(
         'label' => 'above',
@@ -2115,10 +2111,11 @@ function materio_content_types_field_default_field_instances() {
         'weight' => 0,
       ),
       'default' => array(
-        'label' => 'above',
+        'label' => 'hidden',
+        'module' => 'taxonomy',
         'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 11,
+        'type' => 'taxonomy_term_reference_plain',
+        'weight' => 0,
       ),
       'homeblock' => array(
         'label' => 'above',
@@ -2210,7 +2207,7 @@ function materio_content_types_field_default_field_instances() {
         'module' => 'link',
         'settings' => array(),
         'type' => 'link_default',
-        'weight' => 6,
+        'weight' => 3,
       ),
       'homeblock' => array(
         'label' => 'above',

+ 45 - 0
sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc

@@ -157,6 +157,39 @@ function materio_content_types_strongarm() {
       'token' => array(
         'custom_settings' => FALSE,
       ),
+      'homeblock' => array(
+        'custom_settings' => TRUE,
+      ),
+      'bookmark' => array(
+        'custom_settings' => TRUE,
+      ),
+      'cardsmall' => array(
+        'custom_settings' => TRUE,
+      ),
+      'cardmedium' => array(
+        'custom_settings' => TRUE,
+      ),
+      'cardbig' => array(
+        'custom_settings' => TRUE,
+      ),
+      'cardfull' => array(
+        'custom_settings' => TRUE,
+      ),
+      'diff_standard' => array(
+        'custom_settings' => FALSE,
+      ),
+      'print' => array(
+        'custom_settings' => FALSE,
+      ),
+      'email_plain' => array(
+        'custom_settings' => FALSE,
+      ),
+      'email_html' => array(
+        'custom_settings' => FALSE,
+      ),
+      'email_textalt' => array(
+        'custom_settings' => FALSE,
+      ),
     ),
     'extra_fields' => array(
       'form' => array(
@@ -188,6 +221,18 @@ function materio_content_types_strongarm() {
             'visible' => FALSE,
           ),
         ),
+        'workflow_current_state' => array(
+          'default' => array(
+            'weight' => '11',
+            'visible' => FALSE,
+          ),
+        ),
+        'workflow' => array(
+          'default' => array(
+            'weight' => '7',
+            'visible' => FALSE,
+          ),
+        ),
       ),
     ),
   );

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


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

@@ -1196,6 +1196,10 @@ $cardfull_h:610px;
         a{ display:block;}
       }
 
+      &.links{
+        a{font-size:12px;}
+      }
+
       &.flag-lists-entity-links{
         width:160px;
         font-size:0;
@@ -1669,7 +1673,9 @@ body.print-node-materiau{
     }
 
   }
-
+  .field-name-field-tode-company{
+    font-size: 1.5em; font-weight: 700;
+  }
   .field-name-field-description,
   .field-name-field-company-fab,
   .field-name-field-reference-distrib

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