summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BitThemes.php29
-rw-r--r--admin/admin_themes_manager.php17
-rw-r--r--base.css25
-rw-r--r--layouts/gala_01.css8
-rw-r--r--layouts/gala_01.gifbin0 -> 2097 bytes
-rw-r--r--layouts/gala_01.txt1
-rw-r--r--layouts/gala_02.css8
-rw-r--r--layouts/gala_02.gifbin0 -> 2097 bytes
-rw-r--r--layouts/gala_02.txt1
-rw-r--r--layouts/gala_03.css10
-rw-r--r--layouts/gala_03.gifbin0 -> 2059 bytes
-rw-r--r--layouts/gala_03.txt1
-rw-r--r--layouts/gala_04.css10
-rw-r--r--layouts/gala_04.gifbin0 -> 2059 bytes
-rw-r--r--layouts/gala_04.txt1
-rw-r--r--layouts/gala_05.css10
-rw-r--r--layouts/gala_05.gifbin0 -> 2055 bytes
-rw-r--r--layouts/gala_05.txt1
-rw-r--r--layouts/gala_06.css10
-rw-r--r--layouts/gala_06.gifbin0 -> 2055 bytes
-rw-r--r--layouts/gala_06.txt1
-rw-r--r--layouts/gala_07.css9
-rw-r--r--layouts/gala_07.gifbin0 -> 2130 bytes
-rw-r--r--layouts/gala_07.txt1
-rw-r--r--layouts/gala_08.css10
-rw-r--r--layouts/gala_08.gifbin0 -> 2126 bytes
-rw-r--r--layouts/gala_08.txt1
-rw-r--r--layouts/gala_09.css11
-rw-r--r--layouts/gala_09.gifbin0 -> 2087 bytes
-rw-r--r--layouts/gala_09.txt1
-rw-r--r--layouts/gala_10.css11
-rw-r--r--layouts/gala_10.gifbin0 -> 2089 bytes
-rw-r--r--layouts/gala_10.txt1
-rw-r--r--layouts/gala_11.css11
-rw-r--r--layouts/gala_11.gifbin0 -> 2078 bytes
-rw-r--r--layouts/gala_11.txt1
-rw-r--r--layouts/gala_12.css11
-rw-r--r--layouts/gala_12.gifbin0 -> 2076 bytes
-rw-r--r--layouts/gala_12.txt1
-rw-r--r--layouts/gala_13.css8
-rw-r--r--layouts/gala_13.gifbin0 -> 2123 bytes
-rw-r--r--layouts/gala_13.txt1
-rw-r--r--layouts/gala_14.css8
-rw-r--r--layouts/gala_14.gifbin0 -> 2123 bytes
-rw-r--r--layouts/gala_14.txt1
-rw-r--r--layouts/gala_15.css12
-rw-r--r--layouts/gala_15.gifbin0 -> 2085 bytes
-rw-r--r--layouts/gala_15.txt1
-rw-r--r--layouts/gala_16.css12
-rw-r--r--layouts/gala_16.gifbin0 -> 2082 bytes
-rw-r--r--layouts/gala_16.txt1
-rw-r--r--layouts/gala_17.css12
-rw-r--r--layouts/gala_17.gifbin0 -> 2082 bytes
-rw-r--r--layouts/gala_17.txt1
-rw-r--r--layouts/gala_18.css12
-rw-r--r--layouts/gala_18.gifbin0 -> 2078 bytes
-rw-r--r--layouts/gala_18.txt1
-rw-r--r--layouts/gala_19.css8
-rw-r--r--layouts/gala_19.gifbin0 -> 2111 bytes
-rw-r--r--layouts/gala_19.txt1
-rw-r--r--layouts/gala_20.css8
-rw-r--r--layouts/gala_20.gifbin0 -> 2109 bytes
-rw-r--r--layouts/gala_20.txt1
-rw-r--r--layouts/gala_21.css12
-rw-r--r--layouts/gala_21.gifbin0 -> 2072 bytes
-rw-r--r--layouts/gala_21.txt1
-rw-r--r--layouts/gala_22.css12
-rw-r--r--layouts/gala_22.gifbin0 -> 2078 bytes
-rw-r--r--layouts/gala_22.txt1
-rw-r--r--layouts/gala_23.css8
-rw-r--r--layouts/gala_23.gifbin0 -> 2067 bytes
-rw-r--r--layouts/gala_23.txt1
-rw-r--r--layouts/gala_24.css8
-rw-r--r--layouts/gala_24.gifbin0 -> 2071 bytes
-rw-r--r--layouts/gala_24.txt1
-rw-r--r--layouts/gala_25.css8
-rw-r--r--layouts/gala_25.gifbin0 -> 2045 bytes
-rw-r--r--layouts/gala_25.txt1
-rw-r--r--layouts/gala_26.css8
-rw-r--r--layouts/gala_26.gifbin0 -> 2052 bytes
-rw-r--r--layouts/gala_26.txt1
-rw-r--r--layouts/gala_27.css3
-rw-r--r--layouts/gala_27.gifbin0 -> 1986 bytes
-rw-r--r--layouts/gala_27.txt1
-rw-r--r--layouts/gala_28.css3
-rw-r--r--layouts/gala_28.gifbin0 -> 1982 bytes
-rw-r--r--layouts/gala_28.txt1
-rw-r--r--layouts/gala_29.css7
-rw-r--r--layouts/gala_29.gifbin0 -> 2052 bytes
-rw-r--r--layouts/gala_29.txt1
-rw-r--r--layouts/gala_30.css7
-rw-r--r--layouts/gala_30.gifbin0 -> 2056 bytes
-rw-r--r--layouts/gala_30.txt1
-rw-r--r--layouts/gala_31.css7
-rw-r--r--layouts/gala_31.gifbin0 -> 2079 bytes
-rw-r--r--layouts/gala_31.txt1
-rw-r--r--layouts/gala_32.css7
-rw-r--r--layouts/gala_32.gifbin0 -> 2083 bytes
-rw-r--r--layouts/gala_32.txt1
-rw-r--r--layouts/gala_33.css9
-rw-r--r--layouts/gala_33.gifbin0 -> 2082 bytes
-rw-r--r--layouts/gala_33.txt1
-rw-r--r--layouts/gala_34.css9
-rw-r--r--layouts/gala_34.gifbin0 -> 2080 bytes
-rw-r--r--layouts/gala_34.txt1
-rw-r--r--layouts/gala_35.css13
-rw-r--r--layouts/gala_35.gifbin0 -> 2116 bytes
-rw-r--r--layouts/gala_35.txt1
-rw-r--r--layouts/gala_36.css13
-rw-r--r--layouts/gala_36.gifbin0 -> 2093 bytes
-rw-r--r--layouts/gala_36.txt1
-rw-r--r--layouts/gala_37.css8
-rw-r--r--layouts/gala_37.gifbin0 -> 2093 bytes
-rw-r--r--layouts/gala_37.txt1
-rw-r--r--layouts/gala_38.css8
-rw-r--r--layouts/gala_38.gifbin0 -> 2086 bytes
-rw-r--r--layouts/gala_38.txt1
-rw-r--r--layouts/gala_39.css4
-rw-r--r--layouts/gala_39.gifbin0 -> 2019 bytes
-rw-r--r--layouts/gala_39.txt1
-rw-r--r--layouts/gala_40.css4
-rw-r--r--layouts/gala_40.gifbin0 -> 2018 bytes
-rw-r--r--layouts/gala_40.txt1
-rw-r--r--layouts/layouts_style.tar.gzbin0 -> 700 bytes
-rw-r--r--layouts/layouts_xcf.tar.gzbin0 -> 11830 bytes
-rwxr-xr-xlayouts/resize.sh76
-rw-r--r--templates/admin_themes_manager.tpl48
-rw-r--r--templates/header_inc.tpl5
128 files changed, 573 insertions, 24 deletions
diff --git a/BitThemes.php b/BitThemes.php
index 9ac0e5c..3a9a39f 100644
--- a/BitThemes.php
+++ b/BitThemes.php
@@ -21,7 +21,7 @@ class BitThemes extends BitBase {
if( is_dir( $pDir ) ) {
$h = opendir( $pDir );
while( $file = readdir( $h ) ) {
- if ( is_dir( $pDir."$file") && ( $file != '.' && $file != '..' && $file != 'CVS' && $file != 'slideshows' && $file != 'blank') ) {
+ if ( is_dir( $pDir."$file" ) && ( $file != '.' && $file != '..' && $file != 'CVS' && $file != 'slideshows' && $file != 'blank' ) ) {
$ret[] = $file;
}
}
@@ -45,6 +45,31 @@ class BitThemes extends BitBase {
return $ret;
}
+ function getStyleLayouts() {
+ $ret = array();
+
+ if( is_dir( THEMES_PKG_PATH.'layouts/' ) ) {
+ $h = opendir( THEMES_PKG_PATH.'layouts/' );
+ // collect all layouts
+ while( FALSE !== ( $file = readdir( $h ) ) ) {
+ if ( !preg_match( "/^\./", $file ) ) {
+ $ret[substr( $file, 0, ( strrpos( $file, '.' ) ) )][substr( $file, ( strrpos( $file, '.' ) + 1 ) )] = $file;
+ }
+ }
+ closedir( $h );
+
+ // weed out any files that don't have a css file associated with them
+ foreach( $ret as $key => $layout ) {
+ if( empty( $layout['css'] ) ) {
+ unset( $ret[$key] );
+ }
+ }
+
+ ksort( $ret );
+ }
+ return $ret;
+ }
+
/**
* @param $pSubDirs a subdirectory to scan as well - you can pass in multiple dirs using an array
*/
@@ -74,7 +99,7 @@ class BitThemes extends BitBase {
$h = opendir( $pDir );
// cycle through files / dirs
while( FALSE !== ( $file = readdir( $h ) ) ) {
- if ( is_dir( $pDir.$file ) && ( $file != '.' && $file != '..' && $file != 'CVS' && $file != 'slideshows' && $file != 'blank' ) ) {
+ if ( is_dir( $pDir.$file ) && ( $file != '.' && $file != '..' && $file != 'CVS' && $file != 'slideshows' && $file != 'blank' ) ) {
$ret[$file]['style'] = $file;
// check if we want to have a look in any subdirs
foreach( $subDirs as $dir ) {
diff --git a/admin/admin_themes_manager.php b/admin/admin_themes_manager.php
index e23f730..5077789 100644
--- a/admin/admin_themes_manager.php
+++ b/admin/admin_themes_manager.php
@@ -31,6 +31,11 @@ if( $processForm ) {
}
}
+// apply the style layout
+if( !empty( $_REQUEST["site_style_layout"] ) ) {
+ $gBitSystem->storeConfig( 'site_style_layout', ( ( $_REQUEST["site_style_layout"] != 'remove' ) ? $_REQUEST["site_style_layout"] : NULL ), THEMES_PKG_NAME );
+}
+
// apply the site style
if( !empty( $_REQUEST["site_style"] ) ) {
$gBitSystem->storeConfig( 'style', $_REQUEST["site_style"], THEMES_PKG_NAME );
@@ -42,15 +47,19 @@ if( !empty( $_REQUEST["site_style"] ) ) {
// Get list of available styles
$styles = $gBitThemes->getStyles( NULL, TRUE );
$gBitSmarty->assign_by_ref( "styles", $styles );
+
$subDirs = array( 'style_info', 'alternate' );
$stylesList = $gBitThemes->getStylesList( NULL, NULL, $subDirs );
$gBitSmarty->assign_by_ref( "stylesList", $stylesList );
+$styleLayouts = $gBitThemes->getStyleLayouts();
+$gBitSmarty->assign_by_ref( "styleLayouts", $styleLayouts );
+
// set the options biticon takes
-$biticon_display_options = array(
- 'icon' => tra( 'icon' ),
- 'text' => tra( 'text' ),
- 'icon_text' => tra( 'icon and text' )
+$biticon_display_options = array(
+ 'icon' => tra( 'icon' ),
+ 'text' => tra( 'text' ),
+ 'icon_text' => tra( 'icon and text' )
);
$gBitSmarty->assign( "biticon_display_options", $biticon_display_options );
diff --git a/base.css b/base.css
index 79001a1..1535f4b 100644
--- a/base.css
+++ b/base.css
@@ -8,7 +8,7 @@ pre {overflow:auto; text-align:left;}
#bitleft,
#bitright {vertical-align:top; width:170px; overflow:hidden;}
#bitmain {vertical-align:top;}
-#bitbottom {font:10px verdana,sans-serif; color:#999; text-align:center; clear:both;}
+#footer {font:10px verdana,sans-serif; color:#999; text-align:center; clear:both;}
.norecords {font-weight:bold;}
.boxtitle {text-align:center;}
.boxtitle .icon {vertical-align:middle;}
@@ -45,18 +45,18 @@ small {color:#999;}
/*** forms ***/
html>body textarea {width:100%;}
-form {margin:0; padding:0;}
-.row {clear:both;}
-.formlabel {float:left; width:14em; text-align:right;}
-.forminput {margin-left:14.5em;}
-.formhelp {cursor:help;}
-.closebutton {position:absolute; top:1px; right:1px;}
-.submit {text-align:center; padding-bottom:10px;}
-.minifind {width:400px;}
+form {margin:0; padding:0;}
+.row {clear:both;}
+.formlabel {float:left; width:14em; text-align:right;}
+.forminput {margin-left:14.5em;}
+.formhelp {cursor:help;}
+.closebutton {position:absolute; top:1px; right:1px;}
+.submit {text-align:center; padding-bottom:10px;}
+.minifind {width:400px;}
.error,
.errorpage .boxtitle {color:#f00; font-weight:bold;}
-.warning {color:#f80;}
-.success {color:#090;}
+.warning {color:#f80;}
+.success {color:#090;}
.display.confirm .body {width:450px; margin:0 auto;}
/* priorities */
@@ -87,6 +87,9 @@ ul.toc ul {margin-left:1.5em; padding:0;}
ul.data {margin:0; padding:0;}
ul.data li.item {list-style:none; margin:0; padding:0;}
ul.data li.item .thumb {float:right;}
+ul.data h1,
+/* this is needed to make floaticons clickable in data listings */
+ul.data h2 {margin-top:0;}
li.error,li.success,
li.note,li.warning {list-style:none;}
ul.toc li {list-style:none;}
diff --git a/layouts/gala_01.css b/layouts/gala_01.css
new file mode 100644
index 0000000..0b2d517
--- /dev/null
+++ b/layouts/gala_01.css
@@ -0,0 +1,8 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin: 0 25% 0 25%;}
+div.blocks2e #content {margin: 0 25% 0 0;}
+div.blocks2n #content {margin: 0 0 0 25%;}
+div.blocks1 #content {margin: 0 0 0 0;}
+div#navigation {float:left;width:25%;margin-left:-100%}
+div#extra {float:left;width:25%;margin-left:-25%}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_01.gif b/layouts/gala_01.gif
new file mode 100644
index 0000000..af225fa
--- /dev/null
+++ b/layouts/gala_01.gif
Binary files differ
diff --git a/layouts/gala_01.txt b/layouts/gala_01.txt
new file mode 100644
index 0000000..dda30b1
--- /dev/null
+++ b/layouts/gala_01.txt
@@ -0,0 +1 @@
+Three percentage columns
diff --git a/layouts/gala_02.css b/layouts/gala_02.css
new file mode 100644
index 0000000..d3ed3b9
--- /dev/null
+++ b/layouts/gala_02.css
@@ -0,0 +1,8 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin:0 25% 0 25%;}
+div.blocks2e #content {margin:0 0 0 25%;}
+div.blocks2n #content {margin:0 25% 0 0;}
+div.blocks1 #content {margin:0 0 0 0;}
+div#navigation {float:left;width:25%;margin-left:-25%}
+div#extra {float:left;width:25%;margin-left:-100%}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_02.gif b/layouts/gala_02.gif
new file mode 100644
index 0000000..6a3b315
--- /dev/null
+++ b/layouts/gala_02.gif
Binary files differ
diff --git a/layouts/gala_02.txt b/layouts/gala_02.txt
new file mode 100644
index 0000000..dda30b1
--- /dev/null
+++ b/layouts/gala_02.txt
@@ -0,0 +1 @@
+Three percentage columns
diff --git a/layouts/gala_03.css b/layouts/gala_03.css
new file mode 100644
index 0000000..eff6a56
--- /dev/null
+++ b/layouts/gala_03.css
@@ -0,0 +1,10 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-right: 50%;}
+div.blocks2e #content {margin-right: 25%;}
+div.blocks2n #content {margin-right: 25%;}
+div.blocks1 #content {margin-right: 0%;}
+div#navigation {float:left;width:25%;}
+div.blocks3 #navigation {margin-left:-50%;}
+div.blocks2n #navigation {margin-left:-25%;}
+div#extra {float:left;width:25%;margin-left:-25%}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_03.gif b/layouts/gala_03.gif
new file mode 100644
index 0000000..5e0f651
--- /dev/null
+++ b/layouts/gala_03.gif
Binary files differ
diff --git a/layouts/gala_03.txt b/layouts/gala_03.txt
new file mode 100644
index 0000000..dda30b1
--- /dev/null
+++ b/layouts/gala_03.txt
@@ -0,0 +1 @@
+Three percentage columns
diff --git a/layouts/gala_04.css b/layouts/gala_04.css
new file mode 100644
index 0000000..4cca231
--- /dev/null
+++ b/layouts/gala_04.css
@@ -0,0 +1,10 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-right: 50%;}
+div.blocks2e #content {margin-right: 25%;}
+div.blocks2n #content {margin-right: 25%;}
+div.blocks1 #content {margin-right: 0%;}
+div#navigation {float:left;width:25%;margin-left:-25%}
+div#extra {float:left;width:25%;}
+div.blocks3 #extra {margin-left:-50%;}
+div.blocks2e #extra {margin-left:-25%;}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_04.gif b/layouts/gala_04.gif
new file mode 100644
index 0000000..db107ff
--- /dev/null
+++ b/layouts/gala_04.gif
Binary files differ
diff --git a/layouts/gala_04.txt b/layouts/gala_04.txt
new file mode 100644
index 0000000..dda30b1
--- /dev/null
+++ b/layouts/gala_04.txt
@@ -0,0 +1 @@
+Three percentage columns
diff --git a/layouts/gala_05.css b/layouts/gala_05.css
new file mode 100644
index 0000000..31c4be4
--- /dev/null
+++ b/layouts/gala_05.css
@@ -0,0 +1,10 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-left: 50%;}
+div.blocks2e #content {margin-left: 25%;}
+div.blocks2n #content {margin-left: 25%;}
+div.blocks1 #content {margin-left: 0%;}
+div#navigation {float:left;width:25%;margin-left:-100%}
+div#extra {float:left;width:25%;}
+div.blocks3 #extra {margin-left: -75%;}
+div.blocks2e #extra {margin-left:-100%;}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_05.gif b/layouts/gala_05.gif
new file mode 100644
index 0000000..4938f4a
--- /dev/null
+++ b/layouts/gala_05.gif
Binary files differ
diff --git a/layouts/gala_05.txt b/layouts/gala_05.txt
new file mode 100644
index 0000000..dda30b1
--- /dev/null
+++ b/layouts/gala_05.txt
@@ -0,0 +1 @@
+Three percentage columns
diff --git a/layouts/gala_06.css b/layouts/gala_06.css
new file mode 100644
index 0000000..038a60b
--- /dev/null
+++ b/layouts/gala_06.css
@@ -0,0 +1,10 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-left: 50%;}
+div.blocks2e #content {margin-left: 25%;}
+div.blocks2n #content {margin-left: 25%;}
+div.blocks1 #content {margin-left: 0%;}
+div#navigation {float:left;width:25%;}
+div.blocks3 #navigation {margin-left: -75%;}
+div.blocks2n #navigation {margin-left:-100%;}
+div#extra {float:left;width:25%;margin-left:-100%}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_06.gif b/layouts/gala_06.gif
new file mode 100644
index 0000000..99e051b
--- /dev/null
+++ b/layouts/gala_06.gif
Binary files differ
diff --git a/layouts/gala_06.txt b/layouts/gala_06.txt
new file mode 100644
index 0000000..dda30b1
--- /dev/null
+++ b/layouts/gala_06.txt
@@ -0,0 +1 @@
+Three percentage columns
diff --git a/layouts/gala_07.css b/layouts/gala_07.css
new file mode 100644
index 0000000..6ffc83c
--- /dev/null
+++ b/layouts/gala_07.css
@@ -0,0 +1,9 @@
+div#container {width:700px;margin:0 auto}
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin: 0 150px 0 150px;}
+div.blocks2e #content {margin: 0 150px 0 0;}
+div.blocks2n #content {margin: 0 0 0 150px;}
+div.blocks1 #content {margin: 0 0 0 0;}
+div#navigation {float:left;width:150px;margin-left:-700px}
+div#extra {float:left;width:150px;margin-left:-150px}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_07.gif b/layouts/gala_07.gif
new file mode 100644
index 0000000..698a7f2
--- /dev/null
+++ b/layouts/gala_07.gif
Binary files differ
diff --git a/layouts/gala_07.txt b/layouts/gala_07.txt
new file mode 100644
index 0000000..0764865
--- /dev/null
+++ b/layouts/gala_07.txt
@@ -0,0 +1 @@
+Three fixed columns
diff --git a/layouts/gala_08.css b/layouts/gala_08.css
new file mode 100644
index 0000000..574cf1f
--- /dev/null
+++ b/layouts/gala_08.css
@@ -0,0 +1,10 @@
+div#container {width:700px;margin:0 auto}
+div#wrapper {float:left;width:100%}
+div#content {margin: 0 150px}
+div.blocks3 #content {margin: 0 150px 0 150px;}
+div.blocks2e #content {margin: 0 0 0 150px;}
+div.blocks2n #content {margin: 0 150px 0 0;}
+div.blocks1 #content {margin: 0 0 0 0;}
+div#navigation {float:left;width:150px;margin-left:-150px}
+div#extra {float:left;width:150px;margin-left:-700px}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_08.gif b/layouts/gala_08.gif
new file mode 100644
index 0000000..10ebada
--- /dev/null
+++ b/layouts/gala_08.gif
Binary files differ
diff --git a/layouts/gala_08.txt b/layouts/gala_08.txt
new file mode 100644
index 0000000..0764865
--- /dev/null
+++ b/layouts/gala_08.txt
@@ -0,0 +1 @@
+Three fixed columns
diff --git a/layouts/gala_09.css b/layouts/gala_09.css
new file mode 100644
index 0000000..04656a5
--- /dev/null
+++ b/layouts/gala_09.css
@@ -0,0 +1,11 @@
+div#container {width:700px;margin:0 auto}
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-right: 300px;}
+div.blocks2e #content {margin-right: 150px;}
+div.blocks2n #content {margin-right: 150px;}
+div.blocks1 #content {margin-right: 0;}
+div#navigation {float:left;width:150px;}
+div.blocks3 #navigation {margin-left:-300px;}
+div.blocks2n #navigation {margin-left:-150px;}
+div#extra {float:left;width:150px;margin-left:-150px}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_09.gif b/layouts/gala_09.gif
new file mode 100644
index 0000000..d2f4fba
--- /dev/null
+++ b/layouts/gala_09.gif
Binary files differ
diff --git a/layouts/gala_09.txt b/layouts/gala_09.txt
new file mode 100644
index 0000000..0764865
--- /dev/null
+++ b/layouts/gala_09.txt
@@ -0,0 +1 @@
+Three fixed columns
diff --git a/layouts/gala_10.css b/layouts/gala_10.css
new file mode 100644
index 0000000..dcaba13
--- /dev/null
+++ b/layouts/gala_10.css
@@ -0,0 +1,11 @@
+div#container {width:700px;margin:0 auto}
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-right: 300px;}
+div.blocks2e #content {margin-right: 150px;}
+div.blocks2n #content {margin-right: 150px;}
+div.blocks1 #content {margin-right: 0;}
+div#navigation {float:left;width:150px;margin-left:-150px}
+div#extra {float:left;width:150px;}
+div.blocks3 #extra {margin-left:-300px;}
+div.blocks2e #extra {margin-left:-150px;}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_10.gif b/layouts/gala_10.gif
new file mode 100644
index 0000000..fb35ab6
--- /dev/null
+++ b/layouts/gala_10.gif
Binary files differ
diff --git a/layouts/gala_10.txt b/layouts/gala_10.txt
new file mode 100644
index 0000000..0764865
--- /dev/null
+++ b/layouts/gala_10.txt
@@ -0,0 +1 @@
+Three fixed columns
diff --git a/layouts/gala_11.css b/layouts/gala_11.css
new file mode 100644
index 0000000..d9d71df
--- /dev/null
+++ b/layouts/gala_11.css
@@ -0,0 +1,11 @@
+div#container {width:700px;margin:0 auto}
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-left: 300px;}
+div.blocks2e #content {margin-left: 150px;}
+div.blocks2n #content {margin-left: 150px;}
+div.blocks1 #content {margin-left: 0;}
+div#navigation {float:left;width:150px;margin-left:-700px}
+div#extra {float:left;width:150px;}
+div.blocks3 #extra {margin-left:-550px;}
+div.blocks2e #extra {margin-left:-700px;}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_11.gif b/layouts/gala_11.gif
new file mode 100644
index 0000000..af6ef0e
--- /dev/null
+++ b/layouts/gala_11.gif
Binary files differ
diff --git a/layouts/gala_11.txt b/layouts/gala_11.txt
new file mode 100644
index 0000000..0764865
--- /dev/null
+++ b/layouts/gala_11.txt
@@ -0,0 +1 @@
+Three fixed columns
diff --git a/layouts/gala_12.css b/layouts/gala_12.css
new file mode 100644
index 0000000..3844462
--- /dev/null
+++ b/layouts/gala_12.css
@@ -0,0 +1,11 @@
+div#container {width:700px;margin:0 auto}
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-left: 300px;}
+div.blocks2e #content {margin-left: 150px;}
+div.blocks2n #content {margin-left: 150px;}
+div.blocks1 #content {margin-left: 0;}
+div#navigation {float:left;width:150px;}
+div.blocks3 #navigation {margin-left:-550px;}
+div.blocks2n #navigation {margin-left:-700px;}
+div#extra {float:left;width:150px;margin-left:-700px}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_12.gif b/layouts/gala_12.gif
new file mode 100644
index 0000000..eb9b302
--- /dev/null
+++ b/layouts/gala_12.gif
Binary files differ
diff --git a/layouts/gala_12.txt b/layouts/gala_12.txt
new file mode 100644
index 0000000..0764865
--- /dev/null
+++ b/layouts/gala_12.txt
@@ -0,0 +1 @@
+Three fixed columns
diff --git a/layouts/gala_13.css b/layouts/gala_13.css
new file mode 100644
index 0000000..e68adbb
--- /dev/null
+++ b/layouts/gala_13.css
@@ -0,0 +1,8 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin: 0 200px 0 200px;}
+div.blocks2e #content {margin: 0 200px 0 0;}
+div.blocks2n #content {margin: 0 0 0 200px;}
+div.blocks1 #content {margin: 0 200px 0 200px;}
+div#navigation {float:left;width:200px;margin-left:-100%}
+div#extra {float:left;width:200px;margin-left:-200px}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_13.gif b/layouts/gala_13.gif
new file mode 100644
index 0000000..cc96154
--- /dev/null
+++ b/layouts/gala_13.gif
Binary files differ
diff --git a/layouts/gala_13.txt b/layouts/gala_13.txt
new file mode 100644
index 0000000..d28a22c
--- /dev/null
+++ b/layouts/gala_13.txt
@@ -0,0 +1 @@
+Liquid, secondary columns fixed-width
diff --git a/layouts/gala_14.css b/layouts/gala_14.css
new file mode 100644
index 0000000..6b995ce
--- /dev/null
+++ b/layouts/gala_14.css
@@ -0,0 +1,8 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin: 0 200px 0 200px;}
+div.blocks2e #content {margin: 0 0 0 200px;}
+div.blocks2n #content {margin: 0 200px 0 0;}
+div.blocks1 #content {margin: 0 200px 0 200px;}
+div#navigation {float:left;width:200px;margin-left:-200px}
+div#extra {float:left;width:200px;margin-left:-100%}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_14.gif b/layouts/gala_14.gif
new file mode 100644
index 0000000..11795e7
--- /dev/null
+++ b/layouts/gala_14.gif
Binary files differ
diff --git a/layouts/gala_14.txt b/layouts/gala_14.txt
new file mode 100644
index 0000000..d28a22c
--- /dev/null
+++ b/layouts/gala_14.txt
@@ -0,0 +1 @@
+Liquid, secondary columns fixed-width
diff --git a/layouts/gala_15.css b/layouts/gala_15.css
new file mode 100644
index 0000000..d026e96
--- /dev/null
+++ b/layouts/gala_15.css
@@ -0,0 +1,12 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-right: 400px;}
+div.blocks2e #content {margin-right: 200px;}
+div.blocks2n #content {margin-right: 200px;}
+div.blocks1 #content {margin-right: 0;}
+div#navigation {float:left;width:200px;}
+div.blocks3 #navigation {margin-left:-400px;}
+div.blocks2e #navigation {margin-left:-200px;}
+div.blocks2n #navigation {margin-left:-200px;}
+div.blocks1 #navigation {margin-left: 0;}
+div#extra {float:left;width:200px;margin-left:-200px}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_15.gif b/layouts/gala_15.gif
new file mode 100644
index 0000000..84b494e
--- /dev/null
+++ b/layouts/gala_15.gif
Binary files differ
diff --git a/layouts/gala_15.txt b/layouts/gala_15.txt
new file mode 100644
index 0000000..d28a22c
--- /dev/null
+++ b/layouts/gala_15.txt
@@ -0,0 +1 @@
+Liquid, secondary columns fixed-width
diff --git a/layouts/gala_16.css b/layouts/gala_16.css
new file mode 100644
index 0000000..1f1a8f6
--- /dev/null
+++ b/layouts/gala_16.css
@@ -0,0 +1,12 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-right: 400px;}
+div.blocks2e #content {margin-right: 200px;}
+div.blocks2n #content {margin-right: 200px;}
+div.blocks1 #content {margin-right: 0;}
+div#navigation {float:left;width:200px;margin-left:-200px}
+div#extra {float:left;width:200px;}
+div.blocks3 #extra {margin-left:-400px;}
+div.blocks2e #extra {margin-left:-200px;}
+div.blocks2n #extra {margin-left:-200px;}
+div.blocks1 #extra {margin-left: 0;}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_16.gif b/layouts/gala_16.gif
new file mode 100644
index 0000000..262d162
--- /dev/null
+++ b/layouts/gala_16.gif
Binary files differ
diff --git a/layouts/gala_16.txt b/layouts/gala_16.txt
new file mode 100644
index 0000000..d28a22c
--- /dev/null
+++ b/layouts/gala_16.txt
@@ -0,0 +1 @@
+Liquid, secondary columns fixed-width
diff --git a/layouts/gala_17.css b/layouts/gala_17.css
new file mode 100644
index 0000000..faf7fed
--- /dev/null
+++ b/layouts/gala_17.css
@@ -0,0 +1,12 @@
+div#wrapper {float:right;width: 100%;}
+div.blocks3 #wrapper {margin-left:-400px;}
+div.blocks2e #wrapper {margin-left:-200px;}
+div.blocks2n #wrapper {margin-left:-200px;}
+div.blocks1 #wrapper {margin-left: 0;}
+div.blocks3 #content {margin-left: 400px;}
+div.blocks2e #content {margin-left: 200px;}
+div.blocks2n #content {margin-left: 200px;}
+div.blocks1 #content {margin-left: 0;}
+div#navigation {float:right;width:200px}
+div#extra {float:right;width:200px}
+div#footer {clear:right;width:100%}
diff --git a/layouts/gala_17.gif b/layouts/gala_17.gif
new file mode 100644
index 0000000..96a32ff
--- /dev/null
+++ b/layouts/gala_17.gif
Binary files differ
diff --git a/layouts/gala_17.txt b/layouts/gala_17.txt
new file mode 100644
index 0000000..d28a22c
--- /dev/null
+++ b/layouts/gala_17.txt
@@ -0,0 +1 @@
+Liquid, secondary columns fixed-width
diff --git a/layouts/gala_18.css b/layouts/gala_18.css
new file mode 100644
index 0000000..d06e587
--- /dev/null
+++ b/layouts/gala_18.css
@@ -0,0 +1,12 @@
+div#wrapper {float:right;width:100%;}
+div.blocks3 #wrapper {margin-left:-400px;}
+div.blocks2e #wrapper {margin-left:-200px;}
+div.blocks2n #wrapper {margin-left:-200px;}
+div.blocks1 #wrapper {margin-left: 0;}
+div.blocks3 #content {margin-left: 400px;}
+div.blocks2e #content {margin-left: 200px;}
+div.blocks2n #content {margin-left: 200px;}
+div.blocks1 #content {margin-left: 0;}
+div#navigation {float:left;width:200px}
+div#extra {float:right;width:200px}
+div#footer {clear:both;width:100%}
diff --git a/layouts/gala_18.gif b/layouts/gala_18.gif
new file mode 100644
index 0000000..8087c85
--- /dev/null
+++ b/layouts/gala_18.gif
Binary files differ
diff --git a/layouts/gala_18.txt b/layouts/gala_18.txt
new file mode 100644
index 0000000..d28a22c
--- /dev/null
+++ b/layouts/gala_18.txt
@@ -0,0 +1 @@
+Liquid, secondary columns fixed-width
diff --git a/layouts/gala_19.css b/layouts/gala_19.css
new file mode 100644
index 0000000..85eafb6
--- /dev/null
+++ b/layouts/gala_19.css
@@ -0,0 +1,8 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin: 0 33% 0 200px;}
+div.blocks2e #content {margin: 0 33% 0 0;}
+div.blocks2n #content {margin: 0 0 0 200px;}
+div.blocks1 #content {margin: 0 0 0 0;}
+div#navigation {float:left;width:200px;margin-left:-100%}
+div#extra {float:left;width:33%;margin-left:-33%}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_19.gif b/layouts/gala_19.gif
new file mode 100644
index 0000000..24c8fa9
--- /dev/null
+++ b/layouts/gala_19.gif
Binary files differ
diff --git a/layouts/gala_19.txt b/layouts/gala_19.txt
new file mode 100644
index 0000000..2510812
--- /dev/null
+++ b/layouts/gala_19.txt
@@ -0,0 +1 @@
+Liquid, three columns, hybrid widths
diff --git a/layouts/gala_20.css b/layouts/gala_20.css
new file mode 100644
index 0000000..ad5993d
--- /dev/null
+++ b/layouts/gala_20.css
@@ -0,0 +1,8 @@
+div#wrapper {float:left;width:100%;}
+div.blocks3 #content {margin: 0 200px 0 33%;}
+div.blocks2e #content {margin: 0 200px 0 0;}
+div.blocks2n #content {margin: 0 0 0 33%;}
+div.blocks1 #content {margin: 0;}
+div#navigation {float:left;width:33%;margin-left:-100%;}
+div#extra {float:left;width:200px;margin-left:-200px;}
+div#footer {clear:left;width:100%;}
diff --git a/layouts/gala_20.gif b/layouts/gala_20.gif
new file mode 100644
index 0000000..263d959
--- /dev/null
+++ b/layouts/gala_20.gif
Binary files differ
diff --git a/layouts/gala_20.txt b/layouts/gala_20.txt
new file mode 100644
index 0000000..2510812
--- /dev/null
+++ b/layouts/gala_20.txt
@@ -0,0 +1 @@
+Liquid, three columns, hybrid widths
diff --git a/layouts/gala_21.css b/layouts/gala_21.css
new file mode 100644
index 0000000..feb3481
--- /dev/null
+++ b/layouts/gala_21.css
@@ -0,0 +1,12 @@
+div#wrapper {float:left;width:100%;margin-left:-25%}
+div.blocks3 #wrapper {margin-left:-25%;}
+div.blocks2e #wrapper {margin-left:-25%;}
+div.blocks2n #wrapper {margin-left: 0;}
+div.blocks1 #wrapper {margin-left: 0;}
+div.blocks3 #content {margin: 0 200px 0 25%;}
+div.blocks2e #content {margin: 0 0 0 25%;}
+div.blocks2n #content {margin: 0 200px 0 0;}
+div.blocks1 #content {margin: 0 0 0 0;}
+div#navigation {float:left;width:200px;margin-left:-200px}
+div#extra {float:left;width:25%}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_21.gif b/layouts/gala_21.gif
new file mode 100644
index 0000000..c9afee1
--- /dev/null
+++ b/layouts/gala_21.gif
Binary files differ
diff --git a/layouts/gala_21.txt b/layouts/gala_21.txt
new file mode 100644
index 0000000..2510812
--- /dev/null
+++ b/layouts/gala_21.txt
@@ -0,0 +1 @@
+Liquid, three columns, hybrid widths
diff --git a/layouts/gala_22.css b/layouts/gala_22.css
new file mode 100644
index 0000000..9e179e1
--- /dev/null
+++ b/layouts/gala_22.css
@@ -0,0 +1,12 @@
+div#wrapper {float:left;width:100%;}
+div.blocks3 #wrapper {margin-left:-200px;}
+div.blocks2e #wrapper {margin-left:-200px;}
+div.blocks2n #wrapper {margin-left: 0;}
+div.blocks1 #wrapper {margin-left: 0;}
+div.blocks3 #content {margin: 0 25% 0 200px;}
+div.blocks2e #content {margin: 0 0 0 200px;}
+div.blocks2n #content {margin: 0 25% 0 0;}
+div.blocks1 #content {margin: 0 0 0 0;}
+div#navigation {float:left;width:25%;margin-left:-25%}
+div#extra {float:left;width:200px}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_22.gif b/layouts/gala_22.gif
new file mode 100644
index 0000000..a80a02b
--- /dev/null
+++ b/layouts/gala_22.gif
Binary files differ
diff --git a/layouts/gala_22.txt b/layouts/gala_22.txt
new file mode 100644
index 0000000..2510812
--- /dev/null
+++ b/layouts/gala_22.txt
@@ -0,0 +1 @@
+Liquid, three columns, hybrid widths
diff --git a/layouts/gala_23.css b/layouts/gala_23.css
new file mode 100644
index 0000000..c0227d1
--- /dev/null
+++ b/layouts/gala_23.css
@@ -0,0 +1,8 @@
+div#wrapper {float:left;width:100%;margin-left:-200px}
+div.blocks3 #content {margin-left:200px;}
+div.blocks2e #content {margin-left:200px;}
+div.blocks2n #content {margin-left:200px;}
+div.blocks1 #content {}
+div#navigation {float:right;width:200px}
+div#extra {float:right;clear:right;width:200px}
+div#footer {clear:both;width:100%}
diff --git a/layouts/gala_23.gif b/layouts/gala_23.gif
new file mode 100644
index 0000000..387f91b
--- /dev/null
+++ b/layouts/gala_23.gif
Binary files differ
diff --git a/layouts/gala_23.txt b/layouts/gala_23.txt
new file mode 100644
index 0000000..22b209c
--- /dev/null
+++ b/layouts/gala_23.txt
@@ -0,0 +1 @@
+Two columns liquid, side fixed
diff --git a/layouts/gala_24.css b/layouts/gala_24.css
new file mode 100644
index 0000000..07382db
--- /dev/null
+++ b/layouts/gala_24.css
@@ -0,0 +1,8 @@
+div#wrapper {float:right;width:100%;margin-left:-200px}
+div.blocks3 #content {margin-left:200px;}
+div.blocks2e #content {margin-left:200px;}
+div.blocks2n #content {margin-left:200px;}
+div.blocks1 #content {}
+div#navigation {float:left;width:200px}
+div#extra {float:left;clear:left;width:200px}
+div#footer {clear:both;width:100%}
diff --git a/layouts/gala_24.gif b/layouts/gala_24.gif
new file mode 100644
index 0000000..d9e7f77
--- /dev/null
+++ b/layouts/gala_24.gif
Binary files differ
diff --git a/layouts/gala_24.txt b/layouts/gala_24.txt
new file mode 100644
index 0000000..22b209c
--- /dev/null
+++ b/layouts/gala_24.txt
@@ -0,0 +1 @@
+Two columns liquid, side fixed
diff --git a/layouts/gala_25.css b/layouts/gala_25.css
new file mode 100644
index 0000000..b0b76ce
--- /dev/null
+++ b/layouts/gala_25.css
@@ -0,0 +1,8 @@
+div#wrapper {float:left;width:100%;margin-left:-33%}
+div.blocks3 #content {margin-left:33%;}
+div.blocks2e #content {margin-left:33%;}
+div.blocks2n #content {margin-left:33%;}
+div.blocks1 #content {}
+div#navigation {float:right;width:32.9%}
+div#extra {float:right;clear:right;width:32.9%}
+div#footer {clear:both;width:100%}
diff --git a/layouts/gala_25.gif b/layouts/gala_25.gif
new file mode 100644
index 0000000..bf6bec4
--- /dev/null
+++ b/layouts/gala_25.gif
Binary files differ
diff --git a/layouts/gala_25.txt b/layouts/gala_25.txt
new file mode 100644
index 0000000..1b2135c
--- /dev/null
+++ b/layouts/gala_25.txt
@@ -0,0 +1 @@
+Two percentage columns
diff --git a/layouts/gala_26.css b/layouts/gala_26.css
new file mode 100644
index 0000000..c55d0b4
--- /dev/null
+++ b/layouts/gala_26.css
@@ -0,0 +1,8 @@
+div#wrapper {float:right;width:100%;margin-right:-33%}
+div.blocks3 #content {margin-right:33%;}
+div.blocks2e #content {margin-right:33%;}
+div.blocks2n #content {margin-right:33%;}
+div.blocks1 #content {}
+div#navigation {float:left;width:32.9%}
+div#extra {float:left;clear:left;width:32.9%}
+div#footer {clear:both;width:100%}
diff --git a/layouts/gala_26.gif b/layouts/gala_26.gif
new file mode 100644
index 0000000..e66ffe8
--- /dev/null
+++ b/layouts/gala_26.gif
Binary files differ
diff --git a/layouts/gala_26.txt b/layouts/gala_26.txt
new file mode 100644
index 0000000..1b2135c
--- /dev/null
+++ b/layouts/gala_26.txt
@@ -0,0 +1 @@
+Two percentage columns
diff --git a/layouts/gala_27.css b/layouts/gala_27.css
new file mode 100644
index 0000000..d0e6391
--- /dev/null
+++ b/layouts/gala_27.css
@@ -0,0 +1,3 @@
+div#navigation {float:left;width:50%}
+div#extra {float:left;width:50%}
+div#footer {clear:left;width:100%}
diff --git a/layouts/gala_27.gif b/layouts/gala_27.gif
new file mode 100644
index 0000000..930db36
--- /dev/null
+++ b/layouts/gala_27.gif
Binary files differ
diff --git a/layouts/gala_27.txt b/layouts/gala_27.txt
new file mode 100644
index 0000000..39d6e96
--- /dev/null
+++ b/layouts/gala_27.txt
@@ -0,0 +1 @@
+One column liquid and two halves
diff --git a/layouts/gala_28.css b/layouts/gala_28.css
new file mode 100644
index 0000000..8579794
--- /dev/null
+++ b/layouts/gala_28.css
@@ -0,0 +1,3 @@
+div#navigation {float:right;width:50%}
+div#extra {float:right;width:49.9%}
+div#footer {clear:right;width:100%}
diff --git a/layouts/gala_28.gif b/layouts/gala_28.gif
new file mode 100644
index 0000000..474ffdd
--- /dev/null
+++ b/layouts/gala_28.gif
Binary files differ
diff --git a/layouts/gala_28.txt b/layouts/gala_28.txt
new file mode 100644
index 0000000..39d6e96
--- /dev/null
+++ b/layouts/gala_28.txt
@@ -0,0 +1 @@
+One column liquid and two halves
diff --git a/layouts/gala_29.css b/layouts/gala_29.css
new file mode 100644
index 0000000..badc1ba
--- /dev/null
+++ b/layouts/gala_29.css
@@ -0,0 +1,7 @@
+div#wrapper {float:right;}
+div.blocks3 #wrapper {width: 70%;}
+div.blocks2e #wrapper {width:100%;}
+div.blocks2n #wrapper {width: 70%;}
+div.blocks1 #wrapper {width:100%;}
+div#navigation {float:left;width:29.9%}
+div#extra {clear:both;width:100%}
diff --git a/layouts/gala_29.gif b/layouts/gala_29.gif
new file mode 100644
index 0000000..b5e13fd
--- /dev/null
+++ b/layouts/gala_29.gif
Binary files differ
diff --git a/layouts/gala_29.txt b/layouts/gala_29.txt
new file mode 100644
index 0000000..16f65be
--- /dev/null
+++ b/layouts/gala_29.txt
@@ -0,0 +1 @@
+Two percentage columns and one larger
diff --git a/layouts/gala_30.css b/layouts/gala_30.css
new file mode 100644
index 0000000..93bd722
--- /dev/null
+++ b/layouts/gala_30.css
@@ -0,0 +1,7 @@
+div#wrapper {float:left;}
+div.blocks3 #wrapper {width: 70%;}
+div.blocks2e #wrapper {width:100%;}
+div.blocks2n #wrapper {width: 70%;}
+div.blocks1 #wrapper {width:100%;}
+div#navigation {float:right;width:29.9%}
+div#extra {clear:both;width:100%}
diff --git a/layouts/gala_30.gif b/layouts/gala_30.gif
new file mode 100644
index 0000000..9e655fe
--- /dev/null
+++ b/layouts/gala_30.gif
Binary files differ
diff --git a/layouts/gala_30.txt b/layouts/gala_30.txt
new file mode 100644
index 0000000..16f65be
--- /dev/null
+++ b/layouts/gala_30.txt
@@ -0,0 +1 @@
+Two percentage columns and one larger
diff --git a/layouts/gala_31.css b/layouts/gala_31.css
new file mode 100644
index 0000000..850ab68
--- /dev/null
+++ b/layouts/gala_31.css
@@ -0,0 +1,7 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-left:200px}
+div.blocks2e #content {}
+div.blocks2n #content {margin-left:200px}
+div.blocks1 #content {}
+div#navigation {float:left;width:200px;margin-left:-100%}
+div#extra {clear:left;width:100%}
diff --git a/layouts/gala_31.gif b/layouts/gala_31.gif
new file mode 100644
index 0000000..3c1567b
--- /dev/null
+++ b/layouts/gala_31.gif
Binary files differ
diff --git a/layouts/gala_31.txt b/layouts/gala_31.txt
new file mode 100644
index 0000000..ac4eecb
--- /dev/null
+++ b/layouts/gala_31.txt
@@ -0,0 +1 @@
+Two columns liquid, fixed side and large one
diff --git a/layouts/gala_32.css b/layouts/gala_32.css
new file mode 100644
index 0000000..e961606
--- /dev/null
+++ b/layouts/gala_32.css
@@ -0,0 +1,7 @@
+div#wrapper {float:left;width:100%}
+div.blocks3 #content {margin-right:200px}
+div.blocks2e #content {}
+div.blocks2n #content {margin-right:200px}
+div.blocks1 #content {}
+div#navigation {float:left;width:200px;margin-left:-200px}
+div#extra {clear:left;width:100%}
diff --git a/layouts/gala_32.gif b/layouts/gala_32.gif
new file mode 100644
index 0000000..18099b3
--- /dev/null
+++ b/layouts/gala_32.gif
Binary files differ
diff --git a/layouts/gala_32.txt b/layouts/gala_32.txt
new file mode 100644
index 0000000..ac4eecb
--- /dev/null
+++ b/layouts/gala_32.txt
@@ -0,0 +1 @@
+Two columns liquid, fixed side and large one
diff --git a/layouts/gala_33.css b/layouts/gala_33.css
new file mode 100644
index 0000000..e63f11b
--- /dev/null
+++ b/layouts/gala_33.css
@@ -0,0 +1,9 @@
+div#container {width:700px;margin:0 auto}
+div#content {float:left;}
+div.blocks3 #content {width:500px;}
+div.blocks2e #content {width:500px;}
+div.blocks2n #content {width:500px;}
+div.blocks1 #content {width:700px;}
+div#navigation {float:right;width:200px}
+div#extra {float:right;clear:right;width:200px}
+div#footer {clear:both;width:100%}
diff --git a/layouts/gala_33.gif b/layouts/gala_33.gif
new file mode 100644
index 0000000..b50fb55
--- /dev/null
+++ b/layouts/gala_33.gif
Binary files differ
diff --git a/layouts/gala_33.txt b/layouts/gala_33.txt
new file mode 100644
index 0000000..8ee2a03
--- /dev/null
+++ b/layouts/gala_33.txt
@@ -0,0 +1 @@
+Two colums fixed
diff --git a/layouts/gala_34.css b/layouts/gala_34.css
new file mode 100644
index 0000000..32e0097
--- /dev/null
+++ b/layouts/gala_34.css
@@ -0,0 +1,9 @@
+div#container {width:700px;margin:0 auto}
+div#content {float:right;width:500px}
+div.blocks3 #content {width:500px;}
+div.blocks2e #content {width:500px;}
+div.blocks2n #content {width:500px;}
+div.blocks1 #content {width:700px;}
+div#navigation {float:left;width:200px}
+div#extra {float:left;clear:left;width:200px}
+div#footer {clear:both;width:100%}
diff --git a/layouts/gala_34.gif b/layouts/gala_34.gif
new file mode 100644
index 0000000..36dbccd
--- /dev/null
+++ b/layouts/gala_34.gif
Binary files differ
diff --git a/layouts/gala_34.txt b/layouts/gala_34.txt
new file mode 100644
index 0000000..8ee2a03
--- /dev/null
+++ b/layouts/gala_34.txt
@@ -0,0 +1 @@
+Two colums fixed
diff --git a/layouts/gala_35.css b/layouts/gala_35.css
new file mode 100644
index 0000000..1005131
--- /dev/null
+++ b/layouts/gala_35.css
@@ -0,0 +1,13 @@
+div#container {width:700px;margin:0 auto}
+div#content {float:left;}
+div.blocks3 #content {width:500px;}
+div.blocks2e #content {width:700px;}
+div.blocks2n #content {width:500px;}
+div.blocks1 #content {width:700px;}
+div#navigation {float:right;width:200px}
+div#extra {float:left;}
+div.blocks3 #extra {width:500px;}
+div.blocks2e #extra {width:700px;}
+div.blocks2n #extra {width:500px;}
+div.blocks1 #extra {width:700px;}
+div#footer {clear:both;width:100%}
diff --git a/layouts/gala_35.gif b/layouts/gala_35.gif
new file mode 100644
index 0000000..c669ceb
--- /dev/null
+++ b/layouts/gala_35.gif
Binary files differ
diff --git a/layouts/gala_35.txt b/layouts/gala_35.txt
new file mode 100644
index 0000000..8ee2a03
--- /dev/null
+++ b/layouts/gala_35.txt
@@ -0,0 +1 @@
+Two colums fixed
diff --git a/layouts/gala_36.css b/layouts/gala_36.css
new file mode 100644
index 0000000..0e66d44
--- /dev/null
+++ b/layouts/gala_36.css
@@ -0,0 +1,13 @@
+div#container {width:700px;margin:0 auto}
+div#content {float:right;}
+div.blocks3 #content {width:500px;}
+div.blocks2e #content {width:700px;}
+div.blocks2n #content {width:500px;}
+div.blocks1 #content {width:700px;}
+div#navigation {float:left;width:200px}
+div#extra {float:right;width:500px}
+div.blocks3 #extra {width:500px;}
+div.blocks2e #extra {width:700px;}
+div.blocks2n #extra {width:500px;}
+div.blocks1 #extra {width:700px;}
+div#footer {clear:both;width:100%}
diff --git a/layouts/gala_36.gif b/layouts/gala_36.gif
new file mode 100644
index 0000000..fd16734
--- /dev/null
+++ b/layouts/gala_36.gif
Binary files differ
diff --git a/layouts/gala_36.txt b/layouts/gala_36.txt
new file mode 100644
index 0000000..8ee2a03
--- /dev/null
+++ b/layouts/gala_36.txt
@@ -0,0 +1 @@
+Two colums fixed
diff --git a/layouts/gala_37.css b/layouts/gala_37.css
new file mode 100644
index 0000000..3e3a01a
--- /dev/null
+++ b/layouts/gala_37.css
@@ -0,0 +1,8 @@
+div#container {width:700px;margin:0 auto}
+div#content {float:left;}
+div.blocks3 #content {width:500px;}
+div.blocks2e #content {width:700px;}
+div.blocks2n #content {width:500px;}
+div.blocks1 #content {width:700px;}
+div#navigation {float:right;width:200px}
+div#extra {clear:both;width:100%}
diff --git a/layouts/gala_37.gif b/layouts/gala_37.gif
new file mode 100644
index 0000000..d84df86
--- /dev/null
+++ b/layouts/gala_37.gif
Binary files differ
diff --git a/layouts/gala_37.txt b/layouts/gala_37.txt
new file mode 100644
index 0000000..8ee2a03
--- /dev/null
+++ b/layouts/gala_37.txt
@@ -0,0 +1 @@
+Two colums fixed
diff --git a/layouts/gala_38.css b/layouts/gala_38.css
new file mode 100644
index 0000000..f8412d8
--- /dev/null
+++ b/layouts/gala_38.css
@@ -0,0 +1,8 @@
+div#container {width:700px;margin:0 auto}
+div#content {float:right;}
+div.blocks3 #content {width:500px;}
+div.blocks2e #content {width:700px;}
+div.blocks2n #content {width:500px;}
+div.blocks1 #content {width:700px;}
+div#navigation {float:left;width:200px}
+div#extra {clear:both;width:100%}
diff --git a/layouts/gala_38.gif b/layouts/gala_38.gif
new file mode 100644
index 0000000..2e28113
--- /dev/null
+++ b/layouts/gala_38.gif
Binary files differ
diff --git a/layouts/gala_38.txt b/layouts/gala_38.txt
new file mode 100644
index 0000000..8ee2a03
--- /dev/null
+++ b/layouts/gala_38.txt
@@ -0,0 +1 @@
+Two colums fixed
diff --git a/layouts/gala_39.css b/layouts/gala_39.css
new file mode 100644
index 0000000..7c16264
--- /dev/null
+++ b/layouts/gala_39.css
@@ -0,0 +1,4 @@
+div#container {width:700px;margin:0 auto}
+div#navigation {float:left;width:350px}
+div#extra {float:right;width:350px}
+div#footer {clear:both;width:100%}
diff --git a/layouts/gala_39.gif b/layouts/gala_39.gif
new file mode 100644
index 0000000..b958618
--- /dev/null
+++ b/layouts/gala_39.gif
Binary files differ
diff --git a/layouts/gala_39.txt b/layouts/gala_39.txt
new file mode 100644
index 0000000..eb8b361
--- /dev/null
+++ b/layouts/gala_39.txt
@@ -0,0 +1 @@
+One column fixed and two halves
diff --git a/layouts/gala_40.css b/layouts/gala_40.css
new file mode 100644
index 0000000..b35d9a8
--- /dev/null
+++ b/layouts/gala_40.css
@@ -0,0 +1,4 @@
+div#container {width:700px;margin:0 auto}
+div#navigation {float:right;width:350px}
+div#extra {float:left;width:350px}
+div#footer {clear:both;width:100%}
diff --git a/layouts/gala_40.gif b/layouts/gala_40.gif
new file mode 100644
index 0000000..2f867dc
--- /dev/null
+++ b/layouts/gala_40.gif
Binary files differ
diff --git a/layouts/gala_40.txt b/layouts/gala_40.txt
new file mode 100644
index 0000000..eb8b361
--- /dev/null
+++ b/layouts/gala_40.txt
@@ -0,0 +1 @@
+One column fixed and two halves
diff --git a/layouts/layouts_style.tar.gz b/layouts/layouts_style.tar.gz
new file mode 100644
index 0000000..f8c7cbc
--- /dev/null
+++ b/layouts/layouts_style.tar.gz
Binary files differ
diff --git a/layouts/layouts_xcf.tar.gz b/layouts/layouts_xcf.tar.gz
new file mode 100644
index 0000000..ab29605
--- /dev/null
+++ b/layouts/layouts_xcf.tar.gz
Binary files differ
diff --git a/layouts/resize.sh b/layouts/resize.sh
new file mode 100755
index 0000000..6471162
--- /dev/null
+++ b/layouts/resize.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+echo "This script will resize statically sized layouts to whatever size you want. If
+you have not modified the script manually, it will resize pixel values to work
+with a total width of 900px instead of the original 700px. If this is not what
+you want, please edit this file manually to suit your needs."
+echo
+
+if [[ ( $1 == '--help' ) || ( $1 == '-h' ) || ( $1 == '?' ) ]]
+then
+ exit
+fi
+
+# Check to see if we've already made a backup
+if [ -f layouts_css_backup.tar.gz ]
+then
+ echo "I have found a css backup file. Please rename or remove the file
+layouts_css_backup.tar.gz before executing this script again."
+ exit
+fi
+
+echo "Creating backup of css files."
+tar -czf layouts_css_backup.tar.gz *.css
+echo
+echo "Created backup in layouts_css_backup.tar.gz"
+echo
+echo "The script will continue in 5 seconds - hit <ctrl-c> to abort."
+echo 5; sleep 1
+echo 4; sleep 1
+echo 3; sleep 1
+echo 2; sleep 1
+echo 1; sleep 1
+echo
+echo "Executing substitutions."
+
+# This sample script will resize all statically set dimansions to work with 900px instead of 800px
+# total width
+find . -name "*.css" -exec perl -i -wpe 's/700px/900px/g' {} \;
+# half the total width
+find . -name "*.css" -exec perl -i -wpe 's/350px/450px/g' {} \;
+
+# one side column
+find . -name "*.css" -exec perl -i -wpe 's/200px/260px/g' {} \;
+# two side columns
+find . -name "*.css" -exec perl -i -wpe 's/400px/520px/g' {} \;
+# remainder of total width - one side column
+find . -name "*.css" -exec perl -i -wpe 's/500px/640px/g' {} \;
+
+# narrow side column (used when there are 2 side columns in a static layout)
+find . -name "*.css" -exec perl -i -wpe 's/150px/220px/g' {} \;
+# two narrow side columns
+find . -name "*.css" -exec perl -i -wpe 's/300px/440px/g' {} \;
+# remainder of total width - one narrow side column
+find . -name "*.css" -exec perl -i -wpe 's/550px/680px/g' {} \;
+
+
+
+## Use the replacements below to generate a very small layout that works with the layout_style.tar.gz
+## This sample script will resize all statically set dimansions to work with 900px instead of 800px
+## total width
+#find . -name "*.css" -exec perl -i -wpe 's/700px/100px/g' {} \;
+## half the total width
+#find . -name "*.css" -exec perl -i -wpe 's/350px/50px/g' {} \;
+#
+## one side column
+#find . -name "*.css" -exec perl -i -wpe 's/200px/29px/g' {} \;
+## two side columns
+#find . -name "*.css" -exec perl -i -wpe 's/400px/58px/g' {} \;
+## remainder of total width - one side column
+#find . -name "*.css" -exec perl -i -wpe 's/500px/71px/g' {} \;
+#
+## narrow side column (used when there are 2 side columns in a static layout)
+#find . -name "*.css" -exec perl -i -wpe 's/150px/22px/g' {} \;
+## two narrow side columns
+#find . -name "*.css" -exec perl -i -wpe 's/300px/44px/g' {} \;
+## remainder of total width - one narrow side column
+#find . -name "*.css" -exec perl -i -wpe 's/550px/78px/g' {} \;
diff --git a/templates/admin_themes_manager.tpl b/templates/admin_themes_manager.tpl
index d5deacd..1c761c1 100644
--- a/templates/admin_themes_manager.tpl
+++ b/templates/admin_themes_manager.tpl
@@ -7,14 +7,14 @@
<div class="body">
{jstabs}
- {jstab title="Site Theme"}
- {legend legend="Pick Site Theme"}
+ {jstab title="Site Style"}
+ {legend legend="Pick Site Style"}
<ul class="data">
{foreach from=$stylesList item=s}
<li class="{cycle values='odd,even"} item">
<h2>
{if $style eq $s.style}
- {biticon ipackage=liberty iname=success iexplain="Current Theme"}&nbsp;
+ {biticon ipackage=liberty iname=success iexplain="Current Style"}&nbsp;
{/if}
<a href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style={$s.style}">{$s.style|replace:"_":" "}</a>
</h2>
@@ -27,7 +27,7 @@
{$s.style_info.description}
{if $s.alternate}
- <h3>{tr}Variations of this theme{/tr}</h3>
+ <h3>{tr}Variations of this style{/tr}</h3>
<ul>
{foreach from=$s.alternate key=variation item=d}
<li><a href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style={$s.style}&amp;style_variation={$variation}">{$variation|replace:"_":" "}</a></li>
@@ -42,8 +42,43 @@
{/legend}
{/jstab}
+ {jstab title="Style Layout"}
+ <p class="help">
+ {tr}Here you can pick the layout of the site style. this will basically rearrange the positions of the three columns.
+ <br />Please note that not all styles support this method of layout selection. Themes that support the style layout selection have a note of it in the description.
+ <br />For more information on the layouts and how to tweak them, please visit the <a class="external" href="http://www.bitweaver.org/wiki/ThemeLayouts">ThemeLayouts</a>{/tr}
+ </p>
+
+ {legend legend="Pick Style Layout"}
+ <ul class="data" style="list-style:none; margin:0; padding:0;">
+ <li class="item even" style="list-style:none; float:left; display:inline; padding:5px 0; margin:0 0 10px 10px; width:120px; text-align:center"><a href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style_layout=remove">{tr}Don't use any of the style layouts. I want to use my own.{/tr}</a></li>
+ {foreach from=$styleLayouts key=key item=layout}
+ <li class="item {cycle values="odd,even"}" style="list-style:none; float:left; display:inline; margin:0 0 10px 10px; width:120px; text-align:center">
+ <a style="height:150px; display:block;" href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style_layout={$key}">
+ {if $layout.gif}<img src="{$smarty.const.THEMES_PKG_URL}layouts/{$layout.gif}" alt="{tr}Layout{/tr}: {$key}" title="{tr}Layout{/tr}: {$key}"/><br />{/if}
+ {if $gBitSystem->getConfig('site_style_layout') == $key}{biticon ipackage=liberty iname=success iexplain="Current Style Layout"}{/if}
+ {$key|replace:"_":" "}
+ {if $layout.txt}<br />{include file="`$smarty.const.THEMES_PKG_PATH`layouts/`$layout.txt`"}{/if}
+ </a>
+ </li>
+ {/foreach}
+ </ul>
+ {/legend}
+
+ <ul class="help">
+ <li style="background:#ace; border-bottom:3px solid #fff;">{tr}Header: Found at the top of a website - contains website title and slogan.{/tr}</li>
+ <li style="background:#eca; border-bottom:3px solid #fff;">{tr}Content: The main content bearing section of a website.{/tr}</li>
+ <li style="background:#aec; border-bottom:3px solid #fff;">{tr}Navigation: Usually found on the left hand side - frequently contains links to important pages.{/tr}</li>
+ <li style="background:#cae; border-bottom:3px solid #fff;">{tr}Extra: Sometimes found on the right hand side - frequently contains adidtional information and links.{/tr}</li>
+ <li style="background:#cea; border-bottom:3px solid #fff;">{tr}Footer: Usually found at the bottom of a website - contains copyright information and 'powered by' link.{/tr}</li>
+ <li style="background:#eee; border-bottom:3px solid #fff;">{tr}px: Indicates that the block is set using a defined pixel width.{/tr}</li>
+ <li style="background:#eee; border-bottom:3px solid #fff;">{tr}%: Indicates that the block is set using a percentage, making it fluid in terms of browser window width.{/tr}</li>
+ </ul>
+ {/jstab}
+
{jstab title="Miscellaneous"}
{form legend="Miscellaneous Settings"}
+ {*
<div class="row">
{formlabel label="Slideshows theme" for="site_slide_style"}
{forminput}
@@ -51,6 +86,7 @@
{formhelp note="This theme will be used when viewing a wikipage as a slideshow."}
{/forminput}
</div>
+ *}
<div class="row">
{formlabel label="Display action links as" for="site_biticon_display_style"}
@@ -82,7 +118,7 @@
{/form}
{/jstab}
- {jstab title="Delete Theme"}
+ {*jstab title="Delete Theme"}
{form legend="Delete Theme"}
<div class="row">
{formlabel label="Delete theme" for="fRemoveTheme"}
@@ -96,7 +132,7 @@
<input type="submit" name="deleteTabSubmit" value="{tr}Delete{/tr}" onclick="return confirm('Are you sure you want to delete the theme {$styles[ix]|escape}? you will not be able to retrieve them!');" />
</div>
{/form}
- {/jstab}
+ {/jstab*}
{/jstabs}
</div> <!-- end .body -->
</div> <!-- end .themes -->
diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
index c117bb7..4d71497 100644
--- a/templates/header_inc.tpl
+++ b/templates/header_inc.tpl
@@ -1,5 +1,8 @@
-{* $Header: /cvsroot/bitweaver/_bit_themes/templates/header_inc.tpl,v 1.16 2006/07/13 12:07:13 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_themes/templates/header_inc.tpl,v 1.17 2006/08/25 18:28:05 squareing Exp $ *}
{strip}
+{if $gBitSystem->isFeatureActive( 'site_style_layout' )}
+ <link rel="stylesheet" title="{$style}" type="text/css" href="{$smarty.const.THEMES_PKG_URL}layouts/{$gBitSystem->getConfig('site_style_layout')}.css" media="all" />
+{/if}
{if $gBitSystem->mStyles.styleSheet}
<link rel="stylesheet" title="{$style}" type="text/css" href="{$gBitSystem->mStyles.styleSheet}" media="all" />
{/if}