Merge branch 'master' of github.com:gallery/gallery3-contrib
Conflicts: themes/three_nids/views/page.html.php
This commit is contained in:
commit
d2063cb79a
@ -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
|
||||||
*********************************************************************/
|
*********************************************************************/
|
||||||
@ -547,4 +567,4 @@ background: #fcf9ce url('../images/ico-success.png') no-repeat .4em 50%
|
|||||||
/* /modules/user/css/user.css */
|
/* /modules/user/css/user.css */
|
||||||
#g-user-admin-list .g-admin {
|
#g-user-admin-list .g-admin {
|
||||||
color: #8d8d3d !important;
|
color: #8d8d3d !important;
|
||||||
}
|
}
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,9 +47,9 @@
|
|||||||
<?= t("Gallery") ?>
|
<?= t("Gallery") ?>
|
||||||
<? endif ?>
|
<? endif ?>
|
||||||
<? endif ?></title>
|
<? endif ?></title>
|
||||||
<meta name="robots" content="noindex, nofollow, noarchive" />
|
<meta name="robots" content="noindex, nofollow, noarchive" />
|
||||||
<meta name="googlebot" content="noindex, nofollow, noarchive, nosnippet, noodp, noimageindex, notranslate" />
|
<meta name="googlebot" content="noindex, nofollow, noarchive, nosnippet, noodp, noimageindex, notranslate" />
|
||||||
<meta name="slurp" content="noindex, nofollow, noarchive, nosnippet, noodp, noydir" />
|
<meta name="slurp" content="noindex, nofollow, noarchive, nosnippet, noodp, noydir" />
|
||||||
<meta name="msnbot" content="noindex, nofollow, noarchive, nosnippet, noodp" />
|
<meta name="msnbot" content="noindex, nofollow, noarchive, nosnippet, noodp" />
|
||||||
<meta name="teoma" content="noindex, nofollow, noarchive" />
|
<meta name="teoma" content="noindex, nofollow, noarchive" />
|
||||||
<link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
|
<link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
|
||||||
@ -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() ?>
|
||||||
@ -146,7 +147,7 @@
|
|||||||
<? else: ?>
|
<? else: ?>
|
||||||
<?= '<div id="g-column-right">' ?>
|
<?= '<div id="g-column-right">' ?>
|
||||||
<? endif ?>
|
<? endif ?>
|
||||||
|
|
||||||
<? if (($theme->page_subtype != "login") && ($sidebarvisible != "none")): ?>
|
<? if (($theme->page_subtype != "login") && ($sidebarvisible != "none")): ?>
|
||||||
<?= new View("sidebar.html") ?>
|
<?= new View("sidebar.html") ?>
|
||||||
<? endif ?>
|
<? endif ?>
|
||||||
@ -174,7 +175,7 @@
|
|||||||
<ul id="g-credits">
|
<ul id="g-credits">
|
||||||
<?= $theme->credits() ?>
|
<?= $theme->credits() ?>
|
||||||
<?php
|
<?php
|
||||||
$theme_id = module::get_var("gallery", "active_site_theme");
|
$theme_id = module::get_var("gallery", "active_site_theme");
|
||||||
$ini = parse_ini_file(THEMEPATH . "$theme_id/theme.info");
|
$ini = parse_ini_file(THEMEPATH . "$theme_id/theme.info");
|
||||||
print "\n <li>" . $ini["name"] . "</li>";
|
print "\n <li>" . $ini["name"] . "</li>";
|
||||||
print "\n <li>©" . $ini["author"] . "</li>";
|
print "\n <li>©" . $ini["author"] . "</li>";
|
||||||
@ -190,7 +191,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<?= $theme->page_bottom() ?>
|
<?= $theme->page_bottom() ?>
|
||||||
|
|
||||||
<? // <!--start player-->
|
<? // <!--start player-->
|
||||||
// <embed src="/music/collection.m3u" hidden="true" autostart="true" loop="true"></embed>
|
// <embed src="/music/collection.m3u" hidden="true" autostart="true" loop="true"></embed>
|
||||||
// <noembed><bgsound src="/music/collection.m3u"></noembed>
|
// <noembed><bgsound src="/music/collection.m3u"></noembed>
|
||||||
// <!--end player-->
|
// <!--end player-->
|
||||||
|
@ -98,7 +98,7 @@
|
|||||||
<? endif ?>
|
<? endif ?>
|
||||||
<div id="g-site-menu">
|
<div id="g-site-menu">
|
||||||
<? if ($user->admin): ?>
|
<? if ($user->admin): ?>
|
||||||
<?= $theme->site_menu("#g-item-img") ?>
|
<?= $theme->site_menu("#g-item-img") ?>
|
||||||
<? endif ?>
|
<? endif ?>
|
||||||
</div>
|
</div>
|
||||||
<?= $theme->header_bottom() ?>
|
<?= $theme->header_bottom() ?>
|
||||||
|
Reference in New Issue
Block a user