fixed showroom field form bug, removed ordering, fixed card js in node page

This commit is contained in:
Bachir Soussi Chiadmi
2016-12-11 19:50:48 +01:00
parent 8b5d721bfd
commit c56a523286
11 changed files with 126 additions and 83 deletions

View File

@@ -2394,7 +2394,7 @@ function materio_content_types_field_default_field_instances() {
'label' => 'hidden',
'settings' => array(),
'type' => 'hidden',
'weight' => 15,
'weight' => 16,
),
'cardsmall' => array(
'label' => 'above',
@@ -2489,7 +2489,7 @@ function materio_content_types_field_default_field_instances() {
'viewmode' => 'cardmedium',
),
'type' => 'tode',
'weight' => 10,
'weight' => 23,
),
'cardsmall' => array(
'label' => 'above',
@@ -2586,7 +2586,7 @@ function materio_content_types_field_default_field_instances() {
'viewmode' => 'cardmedium',
),
'type' => 'tode',
'weight' => 9,
'weight' => 22,
),
'cardsmall' => array(
'label' => 'above',
@@ -2763,7 +2763,7 @@ function materio_content_types_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
'weight' => 10,
'weight' => 11,
),
'cardsmall' => array(
'label' => 'above',
@@ -2844,7 +2844,7 @@ function materio_content_types_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
'weight' => 11,
'weight' => 12,
),
'cardsmall' => array(
'label' => 'above',
@@ -2924,7 +2924,7 @@ function materio_content_types_field_default_field_instances() {
'label' => 'hidden',
'settings' => array(),
'type' => 'hidden',
'weight' => 16,
'weight' => 17,
),
'cardsmall' => array(
'label' => 'hidden',
@@ -3219,7 +3219,7 @@ function materio_content_types_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
'weight' => 13,
'weight' => 14,
),
'cardsmall' => array(
'label' => 'above',
@@ -3395,7 +3395,7 @@ function materio_content_types_field_default_field_instances() {
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
'weight' => 12,
'weight' => 13,
),
'cardsmall' => array(
'label' => 'above',
@@ -3574,7 +3574,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
'weight' => 14,
'weight' => 15,
),
'cardsmall' => array(
'label' => 'above',
@@ -3660,7 +3660,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
'label' => 'hidden',
'settings' => array(),
'type' => 'hidden',
'weight' => 8,
'weight' => 9,
),
'cardsmall' => array(
'label' => 'above',
@@ -3743,7 +3743,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
'label' => 'above',
'settings' => array(),
'type' => 'hidden',
'weight' => 9,
'weight' => 10,
),
'cardsmall' => array(
'label' => 'above',

View File

@@ -412,7 +412,7 @@ function materio_content_types_strongarm() {
'workflow' => array(
'cardmedium' => array(
'weight' => '8',
'visible' => TRUE,
'visible' => FALSE,
),
'cardbig' => array(
'weight' => '15',

View File

@@ -210,10 +210,22 @@ function showroom_user_default_permissions() {
'module' => 'override_node_options',
);
// Exported permission: 'materio showroom edit all samples fields'.
$permissions['materio showroom edit all samples fields'] = array(
'name' => 'materio showroom edit all samples fields',
'roles' => array(
'administrator' => 'administrator',
'root' => 'root',
),
'module' => 'materio_showroom',
);
// Exported permission: 'materio showroom migrate fields'.
$permissions['materio showroom migrate fields'] = array(
'name' => 'materio showroom migrate fields',
'roles' => array(),
'roles' => array(
'root' => 'root',
),
'module' => 'materio_showroom',
);

View File

@@ -71,6 +71,7 @@ features[user_permission][] = edit own showroom content
features[user_permission][] = edit terms in showroom
features[user_permission][] = edit users with role 13
features[user_permission][] = enter showroom revision log entry
features[user_permission][] = materio showroom edit all samples fields
features[user_permission][] = materio showroom migrate fields
features[user_permission][] = merge showroom terms
features[user_permission][] = override showroom authored by option