Index: /extensions/stripped_black_bloc/admin/admin.inc.php
===================================================================
--- /extensions/stripped_black_bloc/admin/admin.inc.php (revision 11822)
+++ /extensions/stripped_black_bloc/admin/admin.inc.php (revision 11823)
@@ -14,4 +14,5 @@
if(isset($_POST['submit_stripped_black_bloc']))
{
+ $config_send['color_main']=(isset($_POST['f_color_main']) and !empty($_POST['f_color_main'])) ? $_POST['f_color_main'] : 'E6554F';
$config_send['thumbnail']=(isset($_POST['f_thumbnail'])) ? $_POST['f_thumbnail'] : 'piwigo';
$config_send['column_width']=(isset($_POST['f_column_width'])) ? $_POST['f_column_width'] : 170;
Index: /extensions/stripped_black_bloc/admin/admin.tpl
===================================================================
--- /extensions/stripped_black_bloc/admin/admin.tpl (revision 11822)
+++ /extensions/stripped_black_bloc/admin/admin.tpl (revision 11823)
@@ -7,4 +7,9 @@
+ -
+
+
+
+ -
-
Index: /extensions/stripped_black_bloc/admin/maintain.inc.php
===================================================================
--- /extensions/stripped_black_bloc/admin/maintain.inc.php (revision 11822)
+++ /extensions/stripped_black_bloc/admin/maintain.inc.php (revision 11823)
@@ -8,4 +8,5 @@
{
$config = array(
+ 'color_main' => 'E6554F',
'column_width' => 170,
'thumbnail_width' => 150,
@@ -15,5 +16,5 @@
$query = '
INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment)
-VALUES ("stripped_black_bloc" , "'.pwg_db_real_escape_string(serialize($config)).'" , "column_width#thumbnail_width#thumbnail(generated - auto - piwigo)");';
+VALUES ("stripped_black_bloc" , "'.pwg_db_real_escape_string(serialize($config)).'" , "color_main#column_width#thumbnail_width#thumbnail(generated - auto - piwigo)");';
pwg_query($query);
Index: /extensions/stripped_black_bloc/admin/upgrade.inc.php
===================================================================
--- /extensions/stripped_black_bloc/admin/upgrade.inc.php (revision 11822)
+++ /extensions/stripped_black_bloc/admin/upgrade.inc.php (revision 11823)
@@ -8,4 +8,5 @@
{
$config = array(
+ 'color_main' => 'E6554F',
'column_width' => 170,
'thumbnail_width' => 150,
@@ -15,8 +16,20 @@
$query = '
INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment)
-VALUES ("stripped_black_bloc" , "'.pwg_db_real_escape_string(serialize($config)).'" , "column_width#thumbnail_width#thumbnail(generated - auto - piwigo)");';
+VALUES ("stripped_black_bloc" , "'.pwg_db_real_escape_string(serialize($config)).'" , "color_main#column_width#thumbnail_width#thumbnail(generated - auto - piwigo)");';
pwg_query($query);
+ load_conf_from_db();
}
-load_conf_from_db();
+elseif (count(unserialize( $conf['stripped_black_bloc'] ))!=4) {
+ $config = array(
+ 'color_main' => 'E6554F',
+ 'column_width' => 170,
+ 'thumbnail_width' => 150,
+ 'thumbnail' => 'piwigo' //generated - auto - piwigo
+ );
+
+
+ conf_update_param('stripped_black_bloc', pwg_db_real_escape_string(serialize($config)));
+ load_conf_from_db();
+}
?>
Index: /extensions/stripped_black_bloc/language/en_UK/theme.lang.php
===================================================================
--- /extensions/stripped_black_bloc/language/en_UK/theme.lang.php (revision 11822)
+++ /extensions/stripped_black_bloc/language/en_UK/theme.lang.php (revision 11823)
@@ -3,4 +3,5 @@
$lang['Stripped & Columns Theme Configuration'] = 'Stripped & Columns, Configuration Page';
$lang['Page'] = 'Page';
+$lang['color main'] = "Not grey color :";
$lang['Displaying options'] = "Display options";
$lang['Width of columns'] = "Width of columns";
Index: /extensions/stripped_black_bloc/language/fr_FR/theme.lang.php
===================================================================
--- /extensions/stripped_black_bloc/language/fr_FR/theme.lang.php (revision 11822)
+++ /extensions/stripped_black_bloc/language/fr_FR/theme.lang.php (revision 11823)
@@ -3,4 +3,5 @@
$lang['Stripped & Columns Theme Configuration'] = 'Stripped & Columns, Page de configuration';
$lang['Page'] = 'Page';
+$lang['color main'] = "Couleur non grise :";
$lang['Displaying options'] = "Options d'affichage";
$lang['Width of columns'] = "Largeur des colonnes";
Index: /extensions/stripped_black_bloc/local_head.tpl
===================================================================
--- /extensions/stripped_black_bloc/local_head.tpl (revision 11822)
+++ /extensions/stripped_black_bloc/local_head.tpl (revision 11823)
@@ -3,4 +3,7 @@
{html_head}{literal}
Index: /extensions/stripped_black_bloc/theme.css
===================================================================
--- /extensions/stripped_black_bloc/theme.css (revision 11822)
+++ /extensions/stripped_black_bloc/theme.css (revision 11823)
@@ -31,4 +31,5 @@
min-height: 490px;
display:block;
+ width:auto;
}
#menubar {
@@ -64,5 +65,6 @@
.bloc {
display: block;
- margin: 3px;
+ margin-top: 3px;
+ margin-bottom:3px;
padding: 5px;
width: 150px;
@@ -110,4 +112,11 @@
padding:20px;
}
+#subcontent .stuffs_block, .content_block {
+ padding:0;
+}
+#theHeader h1 {
+ padding:0;
+}
+
/****************
color backgroung etc
@@ -142,5 +151,5 @@
background: transparent
}
-#theHeader, .titrePage, .titrePage a, .footer_login a, .navigationBar a {
+#theHeader a, .titrePage a, .footer_login a, .navigationBar a {
color: #E6554F;
}
@@ -160,2 +169,49 @@
border:none;
}
+#menubar {
+ color: #FFFFFF;
+ background-image: url("img/btn.png");
+ border-radius: 5px 5px 5px 5px;
+ font-family: Helvetica,Arial,sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ text-decoration: none;
+ white-space: normal;
+ border: 1px solid #424242;
+ padding:5px;
+}
+#menubar dd{
+ font-weight:normal;
+}
+.browsePath, #theHeader, .titrePage .categoryActions, #imageTitle, .randomButtons, #footer_left, #copyright {
+ color: #FFFFFF;
+ background-image: url("img/btn.png");
+ background-color:transparent;
+ border-radius: 5px 5px 5px 5px;
+ font-family: Helvetica,Arial,sans-serif;
+ font-size: 9px;
+ font-weight: bold;
+ text-decoration: none;
+ text-transform: uppercase;
+ white-space: normal;
+ border: 1px solid #424242;
+ padding:5px;
+}
+#tabZone {
+ color: #FFFFFF;
+ background-image: url("img/btn.png");
+ border-radius: 5px 5px 5px 5px;
+ font-family: Helvetica,Arial,sans-serif;
+ font-size: 9px;
+ font-weight: bold;
+ text-decoration: none;
+ text-transform: uppercase;
+ white-space: normal;
+ border: 1px solid #424242;
+ padding:5px;
+ background-color:transparent;
+}
+#tabZone * {
+ color: #FFFFFF;
+ background-color:transparent;
+}
Index: /extensions/stripped_black_bloc/themeconf.inc.php
===================================================================
--- /extensions/stripped_black_bloc/themeconf.inc.php (revision 11822)
+++ /extensions/stripped_black_bloc/themeconf.inc.php (revision 11823)
@@ -25,8 +25,5 @@
// Need upgrade?
-global $conf;
-
-if (!isset($conf['stripped_black_bloc']))
- include(PHPWG_THEMES_PATH.'stripped_black_bloc/admin/upgrade.inc.php');
+include(PHPWG_THEMES_PATH.'stripped_black_bloc/admin/upgrade.inc.php');
add_event_handler('loc_begin_page_header', 'set_config_values_stripped_black_bloc');
@@ -105,4 +102,8 @@
function stripped_black_bloc_prefilter_index($content, &$smarty)
{
+ $search = '#Menu#';
+ $replacement = "{'Show/hide menu'|@translate}";
+
+ $content = preg_replace($search, $replacement, $content);
$search = '#\{if \!empty\(\$navbar\) \}[\s]*\{include file=\'navigation_bar\.tpl\'\|@get_extent:\'navbar\'\}[\s]*\{/if\}#';
$replacement = '';