|
@@ -1,4 +1,4 @@
|
|
-<?php
|
|
+<?php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -17,7 +17,7 @@ $heads = array();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -25,13 +25,13 @@ $heads = array();
|
|
$heads['apple-mobile-web-app-capable'] = array(
|
|
$heads['apple-mobile-web-app-capable'] = array(
|
|
'#tag' => 'meta',
|
|
'#tag' => 'meta',
|
|
'#attributes' => array(
|
|
'#attributes' => array(
|
|
- 'name' => 'apple-mobile-web-app-capable',
|
|
+ 'name' => 'apple-mobile-web-app-capable',
|
|
'content' => 'yes',
|
|
'content' => 'yes',
|
|
),
|
|
),
|
|
);
|
|
);
|
|
|
|
|
|
|
|
|
|
-
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -39,7 +39,7 @@ $heads['apple-mobile-web-app-capable'] = array(
|
|
$heads['viewport'] = array(
|
|
$heads['viewport'] = array(
|
|
'#tag' => 'meta',
|
|
'#tag' => 'meta',
|
|
'#attributes' => array(
|
|
'#attributes' => array(
|
|
- 'name' => 'viewport',
|
|
+ 'name' => 'viewport',
|
|
'content' => 'width=device-width,initial-scale=1,maximum-scale=1',
|
|
'content' => 'width=device-width,initial-scale=1,maximum-scale=1',
|
|
),
|
|
),
|
|
);
|
|
);
|
|
@@ -53,7 +53,7 @@ $heads['viewport'] = array(
|
|
$heads['icon'] = array(
|
|
$heads['icon'] = array(
|
|
'#tag' => 'link',
|
|
'#tag' => 'link',
|
|
'#attributes' => array(
|
|
'#attributes' => array(
|
|
- 'href' => base_path() . path_to_theme() .'/materio-icon.png',
|
|
+ 'href' => base_path() . path_to_theme() .'/materio-icon.png',
|
|
'rel' => 'shortcut icon',
|
|
'rel' => 'shortcut icon',
|
|
'type' => 'image/png',
|
|
'type' => 'image/png',
|
|
),
|
|
),
|
|
@@ -62,7 +62,7 @@ $heads['icon'] = array(
|
|
$heads['apple-touch-icon'] = array(
|
|
$heads['apple-touch-icon'] = array(
|
|
'#tag' => 'link',
|
|
'#tag' => 'link',
|
|
'#attributes' => array(
|
|
'#attributes' => array(
|
|
- 'href' => $GLOBALS['base_url'] . base_path() . path_to_theme() .'/materio-touch-icon.png',
|
|
+ 'href' => $GLOBALS['base_url'] . base_path() . path_to_theme() .'/materio-touch-icon.png',
|
|
'rel' => 'apple-touch-icon-precomposed',
|
|
'rel' => 'apple-touch-icon-precomposed',
|
|
),
|
|
),
|
|
);
|
|
);
|
|
@@ -75,12 +75,12 @@ $node = isset($vars['node']) ? $vars['node'] : false;
|
|
|
|
|
|
|
|
|
|
if($node){
|
|
if($node){
|
|
-
|
|
+
|
|
|
|
|
|
foreach ($vars['node']->taxonomy as $tid => $term) {
|
|
foreach ($vars['node']->taxonomy as $tid => $term) {
|
|
$vars['classes_array'][] = 'term-vid-'. $term->vid .' term-tid-'. $tid;
|
|
$vars['classes_array'][] = 'term-vid-'. $term->vid .' term-tid-'. $tid;
|
|
}
|
|
}
|
|
-
|
|
+
|
|
|
|
|
|
$mlid = db_result(db_query("SELECT mlid FROM {menu_links} WHERE link_path = '%s'", 'node/'. $vars['node']->nid));
|
|
$mlid = db_result(db_query("SELECT mlid FROM {menu_links} WHERE link_path = '%s'", 'node/'. $vars['node']->nid));
|
|
|
|
|
|
@@ -95,9 +95,14 @@ foreach ($vars['user']->roles as $key => $value) {
|
|
$vars['classes_array'][] = "role-" . $key;
|
|
$vars['classes_array'][] = "role-" . $key;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
if(isset($vars['page']['sidebar_first']) && isset($vars['page']['sidebar_second'])){
|
|
if(isset($vars['page']['sidebar_first']) && isset($vars['page']['sidebar_second'])){
|
|
- $layout = 'two-sidebars';
|
|
+ $layout = 'two-sidebars';
|
|
}else if(isset($vars['page']['sidebar_first']) || isset($vars['page']['sidebar_second'])){
|
|
}else if(isset($vars['page']['sidebar_first']) || isset($vars['page']['sidebar_second'])){
|
|
$layout = isset($vars['page']['sidebar_first']) ? 'sidebar-first' : 'sidebar-second';
|
|
$layout = isset($vars['page']['sidebar_first']) ? 'sidebar-first' : 'sidebar-second';
|
|
}else{
|
|
}else{
|
|
@@ -127,7 +132,7 @@ drupal_add_js(array('materiobasetheme' => array(
|
|
'page_callback' => $menu_item['page_callback'],
|
|
'page_callback' => $menu_item['page_callback'],
|
|
'node_type' => isset($node->type) ? $node->type : false,
|
|
'node_type' => isset($node->type) ? $node->type : false,
|
|
'node_nid' => isset($node->nid) ? $node->nid : false,
|
|
'node_nid' => isset($node->nid) ? $node->nid : false,
|
|
- 'language'=>$language->language,
|
|
+ 'language'=>$language->language,
|
|
)), 'setting');
|
|
)), 'setting');
|
|
|
|
|
|
$head_title_array = array();
|
|
$head_title_array = array();
|