1
0

Merge branch 'master' of github.com:gallery/gallery3-contrib

Conflicts:
	themes/three_nids/views/page.html.php
This commit is contained in:
Bharat Mediratta 2010-06-26 12:08:42 -07:00
commit d2063cb79a
3 changed files with 32 additions and 11 deletions

View File

@ -419,6 +419,26 @@ th {
background-color: #FFF; background-color: #FFF;
} }
/* Theme options ~~~~~~~~~~~~~~~~~~~~~~~~ */
#g-theme-options-form {
border: 1px solid #9e7247;
}
#g-theme-options-form-tabs {
border: none !important;
}
#g-theme-options-form fieldset {
border: none;
}
.ui-tabs .ui-tabs-nav li a {
padding: 0 1em;
}
.ui-tabs .ui-tabs-nav li a.g-error {
background: none no-repeat scroll 0 0 transparent;
color: #FF0000 !important;
}
/** ******************************************************************* /** *******************************************************************
* 5) Navigation and menus * 5) Navigation and menus
*********************************************************************/ *********************************************************************/

View File

@ -5,8 +5,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<!-- Copyright (c) 2009 DragonSoft. All Rights Reserved --> <!-- Copyright (c) 2009 DragonSoft. All Rights Reserved -->
<? $sidebarvisible = $_REQUEST['sb']; <?
if (empty($sidebarvisible)) { if (empty($_REQUEST['sb'])) {
if (isset($_COOKIE['gd_sidebar'])) { if (isset($_COOKIE['gd_sidebar'])) {
$sidebarvisible = $_COOKIE['gd_sidebar']; $sidebarvisible = $_COOKIE['gd_sidebar'];
} else { } else {
@ -14,6 +14,7 @@
} }
} else { } else {
// Sidebar position is kept for 360 days // Sidebar position is kept for 360 days
$sidebarvisible = $_REQUEST['sb'];
setcookie("gd_sidebar", $sidebarvisible, time() + 31536000); setcookie("gd_sidebar", $sidebarvisible, time() + 31536000);
} }
@ -87,7 +88,7 @@
<? if (!$user->guest): ?> <? if (!$user->guest): ?>
<div id="g-site-menu"> <div id="g-site-menu">
<?= $theme->site_menu() ?> <?= $theme->site_menu("") ?>
</div> </div>
<? endif ?> <? endif ?>
<?= $theme->messages() ?> <?= $theme->messages() ?>