bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed some display bug

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-06-24 17:20:14 +02:00
parent ade4a41f76
commit 09d1f06552
4 changed files with 1067 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sites/all/themes/gui/materiobasetheme/preprocess/html.pre.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
// dsm($vars, 'vars');
@@ -17,7 +17,7 @@ $heads = array();
// $heads['HandheldFriendly'] = array(
// '#tag' => 'meta',
// '#attributes' => array(
// 'name' => 'HandheldFriendly',
// 'name' => 'HandheldFriendly',
// 'content' => 'true',
// ),
// );
@@ -25,13 +25,13 @@ $heads = array();
$heads['apple-mobile-web-app-capable'] = array(
'#tag' => 'meta',
'#attributes' => array(
'name' => 'apple-mobile-web-app-capable',
'name' => 'apple-mobile-web-app-capable',
'content' => 'yes',
),
);
# Mobile Viewport Fix
# j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag
# j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag
# device-width : Occupy full width of the screen in its current orientation
# initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height
# maximum-scale = 1.0 retains dimensions instead of zooming in if page width < device width
@@ -39,7 +39,7 @@ $heads['apple-mobile-web-app-capable'] = array(
$heads['viewport'] = array(
'#tag' => 'meta',
'#attributes' => array(
'name' => 'viewport',
'name' => 'viewport',
'content' => 'width=device-width,initial-scale=1,maximum-scale=1',
),
);
@@ -53,7 +53,7 @@ $heads['viewport'] = array(
$heads['icon'] = array(
'#tag' => 'link',
'#attributes' => array(
'href' => base_path() . path_to_theme() .'/materio-icon.png',
'href' => base_path() . path_to_theme() .'/materio-icon.png',
'rel' => 'shortcut icon',
'type' => 'image/png',
),
@@ -62,7 +62,7 @@ $heads['icon'] = array(
$heads['apple-touch-icon'] = array(
'#tag' => 'link',
'#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',
),
);
@@ -75,12 +75,12 @@ $node = isset($vars['node']) ? $vars['node'] : false;
# add body classes
if($node){
# from taxonomy
foreach ($vars['node']->taxonomy as $tid => $term) {
$vars['classes_array'][] = 'term-vid-'. $term->vid .' term-tid-'. $tid;
}
# from menu
$mlid = db_result(db_query("SELECT mlid FROM {menu_links} WHERE link_path = '%s'", 'node/'. $vars['node']->nid));
// Now get the menu related information.
@@ -95,9 +95,14 @@ foreach ($vars['user']->roles as $key => $value) {
$vars['classes_array'][] = "role-" . $key;
}
// dsm($vars);
// if(){
// $vars['classes_array'][] = "fixed-grid";
// }
/*
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'])){
$layout = isset($vars['page']['sidebar_first']) ? 'sidebar-first' : 'sidebar-second';
}else{
@@ -127,7 +132,7 @@ drupal_add_js(array('materiobasetheme' => array(
'page_callback' => $menu_item['page_callback'],
'node_type' => isset($node->type) ? $node->type : false,
'node_nid' => isset($node->nid) ? $node->nid : false,
'language'=>$language->language,
'language'=>$language->language,
)), 'setting');
$head_title_array = array();