[Thevr-commit] SF.net SVN: thevr: [69] mods/cms/trunk

[<dac...@us...>]

Revision: 69
          http://thevr.svn.sourceforge.net/thevr/?rev=69&view=rev
Author:   dachebodt
Date:     2007-10-13 13:11:58 -0700 (Sat, 13 Oct 2007)

Log Message:
-----------
Quite a few changes to cs module

Modified Paths:
--------------
    mods/cms/trunk/cms_install.php
    mods/cms/trunk/common.php
    mods/cms/trunk/modules/core/acp_core.php
    mods/cms/trunk/modules/cs/custom_style.php
    mods/cms/trunk/modules/cs/functions_blocks_admin.php
    mods/cms/trunk/modules/cs/functions_style_generator.php
    mods/cms/trunk/modules/cs/js/stylegenerator.js
    mods/cms/trunk/modules/cs/style.php
    mods/cms/trunk/modules/cs/template/cs.css
    mods/cms/trunk/modules/cs/template/stylegenerator.css
    mods/cms/trunk/modules/zebra/template/pro_zebra.html
    mods/cms/trunk/styles/prosilver/template/cs_generator.html
    mods/cms/trunk/styles/prosilver/template/custom_style_view.html

Modified: mods/cms/trunk/cms_install.php
===================================================================
--- mods/cms/trunk/cms_install.php	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/cms_install.php	2007-10-13 20:11:58 UTC (rev 69)
@@ -58,7 +58,7 @@
 
 	include($phpbb_root_path . "modules/core/acp_core.$phpEx");
 
-	if($mod == 'mods')
+	if($mod == 'core')
 	{
 		$sql = 'ALTER TABLE `' . MODULES_TABLE . '` ADD `module_dir` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL';
 		$db->sql_query($sql);
@@ -164,6 +164,7 @@
 	{
 		// install example data here
 		set_config('cms_enabled', '1');
+		$cache->purge();
 
 		$content = '<p>CMS successfully installed!</p><br />';
 		$content.= '<p><b>*NOTE*: Please be sure to delete this file before you continue...</b></p><br />';

Modified: mods/cms/trunk/common.php
===================================================================
--- mods/cms/trunk/common.php	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/common.php	2007-10-13 20:11:58 UTC (rev 69)
@@ -202,6 +202,12 @@
 	{
 		$user->add_mod_lang(array($module => 'common'));
 	}
+
+	//include jquery
+	$template->assign_block_vars('header', array(
+		'TYPE'	=> 'javascript',
+		'LINK'	=> $phpbb_root_path . 'includes/js/jquery.js'
+	));
 }
 
 ?>
\ No newline at end of file

Modified: mods/cms/trunk/modules/core/acp_core.php
===================================================================
--- mods/cms/trunk/modules/core/acp_core.php	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/modules/core/acp_core.php	2007-10-13 20:11:58 UTC (rev 69)
@@ -200,6 +200,7 @@
 
 						$message = sprintf($user->lang['MOD_INSTALLED'], $mod, implode(', ', array_unique($affected_classes)));
 						set_config($mod . '_version', $dir_mods[$mod]['mod_vers']);
+						$cache->destroy('cms_modules');
 					}
 
 					$template->assign_vars(array(
@@ -327,6 +328,7 @@
 
 							unset($db_mods[array_search($mod, $db_mods)]);
 							$message = (sizeof($errors) > 0) ? $error : sprintf($user->lang['MOD_UNINSTALLED'], $mod, implode(', ',  $affected_classes));
+							$cache->destroy('cms_modules');
 						}
 						else
 						{

Modified: mods/cms/trunk/modules/cs/custom_style.php
===================================================================
--- mods/cms/trunk/modules/cs/custom_style.php	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/modules/cs/custom_style.php	2007-10-13 20:11:58 UTC (rev 69)
@@ -2,7 +2,7 @@
 /** 
 *
 * @package custom style mod
-* @version $Id: custom_style.php,v 1.68 2006/08/12 13:12:19 blitze Exp $
+* @version $Id: custom_style.php,v 1.68 2006/08/12 13:12:19 Blitze Exp $
 * @copyright (c) 2005 phpBB Group 
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
 *
@@ -89,17 +89,17 @@
 
 			// show permission preview box as long as it is profile owner or admin			
 			$template->assign_vars(array('PREVIEW_OPTIONS' => $blocks_admin->get_auth_options($this->auth_levels_data)));
-		}		
 
-		// get user blocks
-		$sql = 'SELECT side, max(pos) as max FROM ' . UG_BLOCKS_TABLE . " WHERE $this->ug_type = $this->ug_id GROUP BY side";
-		$result = $db->sql_query($sql);
+			// get user blocks
+			$sql = 'SELECT side, max(pos) as max FROM ' . UG_BLOCKS_TABLE . " WHERE $this->ug_type = $this->ug_id GROUP BY side";
+			$result = $db->sql_query($sql);
 		
-		while($row = $db->sql_fetchrow($result))
-		{
-			${$row['side'] . '_max'} =  $row['max'];
-		}
-		
+			while($row = $db->sql_fetchrow($result))
+			{
+				${$row['side'] . '_max'} =  $row['max'];
+			}
+		}		
+
 		$l_ary = array();
 		$c_ary = array();
 		$r_ary = array();
@@ -171,9 +171,6 @@
 
 				foreach($col as $blocks => $block)
 				{
-					//$block_data_ary = array();
-					//$block_config_ary = array();
-
 					@include_once($blocks_dir . $block['module'] . '/blocks/' .  $block['name'] . '.' . $phpEx);
 
 					$block_data_ary = $block['name']($block);

Modified: mods/cms/trunk/modules/cs/functions_blocks_admin.php
===================================================================
--- mods/cms/trunk/modules/cs/functions_blocks_admin.php	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/modules/cs/functions_blocks_admin.php	2007-10-13 20:11:58 UTC (rev 69)
@@ -284,7 +284,6 @@
 		$content_ary = utf8_normalize_nfc(request_var('content', array(''=>''), true));
 
 		$ex = ( $ex ) ? '1' : '0';
-		//$content_ary = array_map('addslashes', $content_ary);
 		$content = implode('~', $content_ary);
 
 		$enable_smilies	= ($config['allow_smilies'] && $user->optionget('smilies')) ? true : false;

Modified: mods/cms/trunk/modules/cs/functions_style_generator.php
===================================================================
--- mods/cms/trunk/modules/cs/functions_style_generator.php	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/modules/cs/functions_style_generator.php	2007-10-13 20:11:58 UTC (rev 69)
@@ -20,7 +20,7 @@
 
 	function display_generator($ug_type, $ug_id, $data, $u_action)
 	{
-		global $user, $template;
+		global $user, $template, $phpbb_root_path;
 
 		$this->ug_type = $ug_type;
 		$this->ug_id = $ug_id;
@@ -43,8 +43,25 @@
 			redirect(append_sid($u_action));
 		}
 
+		//generate background images popup
+		$bg_img_options = '';
+		$directory = 'modules/cs/images/bg/';
+
+		$dh = @opendir($phpbb_root_path . $directory);
+
+		if ($dh)
+		{
+			$board_url = generate_board_url();
+			while (($file = readdir($dh)) !== false)
+			{
+				if(preg_match('/^(.*)\.(gif|png|jpe?g)$/', $file))
+				{
+					$bg_img_options .= '<option value="' . $board_url . '/' . $directory . $file . '">' . $file . '</option>';
+				}
+			}
+		}
+
 		$header_include = array(
-			"includes/js/jquery.js"				=> 'javascript',
 			"includes/js/iutil.js"				=> 'javascript',
 			"includes/js/ifx.js"				=> 'javascript',
 			"includes/js/ifxfold.js"			=> 'javascript',
@@ -64,7 +81,7 @@
 		{
 			$template->assign_block_vars('header', array(
 				'TYPE'	=> $type,
-				'LINK'	=> $src
+				'LINK'	=> $phpbb_root_path . $src
 			));
 		}
 
@@ -86,9 +103,8 @@
 		$hide_bottom = ($data['drop_shadow_option'] == '3') ? true : false;
 
 		$template->assign_vars(array(
-			'U_CUSTOMIZE'			=> true,
+			'U_CUSTOMIZE'		=> true,
 
-
 			// GENERAL
 			'BORDER'			=> $data['border'],
 			'BORDER_STYLE' 		=> $data['border_style'],
@@ -99,6 +115,7 @@
 			'BG_OPACITY'		=> $data['bg_opacity'],
 			'BG_ATTACHMENT'		=> $data['bg_attachment'],
 			'BG_POSITION'		=> $data['position'],
+			'BG_IMG_OPTIONS'		=> $bg_img_options,
 			'DROP_SHADOW_COLOR'	=> $data['drop_shadow_color'],
 	
 			// BLOCK HEADER
@@ -113,10 +130,10 @@
 			'HDR_BORDER_BOTTOM'	=> ($hide_bottom) ? '0' : $data['hdr_border'],
 			'HDR_BORDER_STYLE' 	=> $data['hdr_border_style'],
 			'HDR_BORDER_COLOR' 	=> $data['hdr_border_color'],
-			'HDR_BG_COLOR' 		=> ($data['hdr_bg_color']) ? $data['hdr_bg_color'] : 'transparent',
+			'HDR_BG_COLOR' 		=> $data['hdr_bg_color'],
 			'HDR_BG_IMG' 		=> $data['hdr_bg_img'],
 			'HDR_BG_STYLE' 		=> $data['hdr_bg_style'],
-			//'HDR_BG_OPACITY' 		=> $data['hdr_bg_opacity'],
+			//'HDR_BG_OPACITY' 	=> $data['hdr_bg_opacity'],
 			'HDR_BG_POSITION' 	=> $data['hdr_position'],
 	
 			// BLOCK BODY
@@ -131,7 +148,7 @@
 			'BLK_BORDER_TOP'		=> ($hide_bottom) ? '0' : $data['blk_border'],
 			'BLK_BORDER_STYLE' 	=> $data['blk_border_style'],
 			'BLK_BORDER_COLOR' 	=> $data['blk_border_color'],
-			'BLK_BG_COLOR' 		=> ($data['blk_bg_color']) ? $data['blk_bg_color'] : 'transparent',
+			'BLK_BG_COLOR' 		=> $data['blk_bg_color'],
 			'BLK_BG_IMG' 		=> $data['blk_bg_img'],
 			'BLK_BG_STYLE' 		=> $data['blk_bg_style'],
 			'BLK_BG_OPACITY' 		=> $data['blk_bg_opacity'],

Modified: mods/cms/trunk/modules/cs/js/stylegenerator.js
===================================================================
--- mods/cms/trunk/modules/cs/js/stylegenerator.js	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/modules/cs/js/stylegenerator.js	2007-10-13 20:11:58 UTC (rev 69)
@@ -2,8 +2,8 @@
 {
 	serial = $.SortSerialize();
 	alert(serial.hash);
-	//$('form')[0].submit();
-	document.form['generator'].submit();
+	$('#generator')[0].submit();
+	//document.form['generator'].submit();
 }
 
 function pickcolor(field, chngCss, cssAtr, link){
@@ -16,6 +16,27 @@
 	$('#colorpicker').show();
 }
 
+function pickbg(field, chngCss){
+	fieldId = '#'+field;
+	v = $(fieldId).val();
+	$('#bg_options').val(v); 
+	reconBoxPos(field+'_link', '#bgpicker');
+	$('#bgpicker').show();
+	$('#selectBg').bind('click', function() {
+		img = $('#bg_options').val();
+		$(fieldId).val(img);
+		closeBgPicker(); 
+	});
+	$('#bg_options').change(function() {
+		img = $('#bg_options').val();
+		$(chngCss).css('backgroundImage', 'url('+img+')');
+	});
+	$('#closeBgPicker').click(function() {
+		$(chngCss).css('backgroundImage', 'url('+v+')');
+		closeBgPicker(); 
+	});
+}
+
 function changecss(element, chngCss, val) {
 	$(element).css(chngCss,val);
 }
@@ -26,21 +47,20 @@
 	$('#colorpicker').hide();
 }
 
-function closePicker() {
+function closeColorPicker() {
 	var f = $.farbtastic('#picker');
 	var val = $(f.fieldId).get(0).value; 
 	changecss(f.selected, f.chngCss, val);
 	$('#colorpicker').hide();
 }
-/*
-function toggle(obj)
-{
-	obj.style.display = (obj.style.display != 'none' ? 'none' : 'block');
-	return true;
+
+function closeBgPicker() {
+	$('#selectBg').unbind();
+	$('#bg_options').unbind();
+	$('#closeBgPicker').unbind();
+	$('#bgpicker').hide();
 }
-*/
 
-/*################################*/
 function toggleBgStyle(obj, v, e)
 {
 	if(v == 'no-repeat')
@@ -54,6 +74,7 @@
 		changecss(obj, 'backgroundRepeat', 'repeat'); 
 	}
 }
+
 function point_prev(val, el)
 {
 	el = '#' + el;
@@ -61,6 +82,7 @@
 	if(val){ if(val == 'pointer;cursor:hand' ){ val = 'hand'; } $(el).html('<img src="modules/cs/images/pointers/cursor-'+val+'.gif" valign="baseline" alt="">'); $(el).fadeIn(); }
 	else { $(el).fadeOut(); }
 }
+
 function toggle_shadow(val)
 {
 	var hb = $('#hdr_border').val();
@@ -85,44 +107,6 @@
 	}
 }
 
-function album_popup(previewId,element, link, box)
-{
-	cats('', '', '', 'cats');
-	reconBoxPos(link, box); 
-	new Effect.Appear('bg_select');
-	document.album_browser.field.value = element;
-	document.album_browser.previewId.value = previewId;
-}
-
-function cats(val,type,parent,mode)
-{
-	var url = 'custom_profile_ajax.php';
-	var pars = 'm='+mode+'&c='+val+'&t='+type+'&p='+parent; 
-	var target = mode;
-
-	var myAjax = new Ajax.Updater(target, url, { asynchronous:true, evalScripts:true, /*onCreate: function() { loadingRequest(loader, target); },*/ onComplete: function() { completedRequest(loader, target); }, parameters: pars, method: 'get' });
-}
-
-function img_preview(val)
-{
-	if(val)
-	{
-		id = 'img_preview';
-		url = 'album_thumbnail.php?pic_id='+val;
-		$(id).style.background = 'white url('+url+') no-repeat scroll center center';
-		document.album_browser.selImg.value = val;
-	}
-}
-
-function album_popup_close()
-{
-	var field = document.album_browser.field.value; 
-	var previewId = document.album_browser.previewId.value; 
-	var imgUrl = 'album_pic.php?pic_id=' + document.album_browser.selImg.value;
-	document.custom_profile.elements[field].value = imgUrl;
-	changecss(previewId, 'backgroundImage', 'url('+imgUrl+')', '', false, '');
-	Effect.Fade('bg_select');
-}
 function reconBoxPos(link, box)
 {
 	var left = 0;

Modified: mods/cms/trunk/modules/cs/style.php
===================================================================
--- mods/cms/trunk/modules/cs/style.php	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/modules/cs/style.php	2007-10-13 20:11:58 UTC (rev 69)
@@ -209,21 +209,40 @@
 			'{LINK_POINTER}'		=> $cprofiledata['link_pointer'],
 	);
 
-	if($cprofiledata['bg_opacity'])
+	$gen_opacity_comment_open = '';
+	$gen_opacity_comment_close = '';
+	$hdr_img_comment_open = '';
+	$hdr_img_comment_close = '';
+	$blk_img_comment_open = '';
+	$blk_img_comment_close = '';
+
+	if(!$cprofiledata['bg_opacity'])
 	{
-		$comment = array(
-			'{GEN_OPACITY_COMMENT_OPEN}'	=> '',
-			'{GEN_OPACITY_COMMENT_CLOSE}'	=> '',
-		);
+		$gen_opacity_comment_open = '/*';
+		$gen_opacity_comment_close = '*/';
 	}
-	else
+
+	if(!$cprofiledata['hdr_bg_img'])
 	{
-		$comment = array(
-			'{GEN_OPACITY_COMMENT_OPEN}'	=> '/*',
-			'{GEN_OPACITY_COMMENT_CLOSE}'	=> '*/',
-		);
+		$hdr_img_comment_open = '/*';
+		$hdr_img_comment_close = '*/';
 	}
 
+	if(!$cprofiledata['blk_bg_img'])
+	{
+		$blk_img_comment_open = '/*';
+		$blk_img_comment_close = '*/';
+	}
+
+	$comment = array(
+		'{GEN_OPACITY_COMMENT_OPEN}'	=> $gen_opacity_comment_open,
+		'{GEN_OPACITY_COMMENT_CLOSE}'	=> $gen_opacity_comment_close,
+		'{HDR_IMG_COMMENT_OPEN}'	=> $hdr_img_comment_open,
+		'{HDR_IMG_COMMENT_CLOSE}'	=> $hdr_img_comment_close,
+		'{BLK_IMG_COMMENT_OPEN}'	=> $blk_img_comment_open,
+		'{BLK_IMG_COMMENT_CLOSE}'	=> $blk_img_comment_close,
+	);
+
 	$replace = array_merge($replace, $comment);
 
 	$css_data = str_replace(array_keys($replace), array_values($replace), $css_data);
@@ -238,4 +257,4 @@
 
 exit;
 
-?>
+?>
\ No newline at end of file

Modified: mods/cms/trunk/modules/cs/template/cs.css
===================================================================
--- mods/cms/trunk/modules/cs/template/cs.css	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/modules/cs/template/cs.css	2007-10-13 20:11:58 UTC (rev 69)
@@ -35,9 +35,11 @@
 	font-size: {HDR_FONT_SIZE}px;
 	color: {HDR_FONT_COLOR};
 	background-color: {HDR_BG_COLOR};
+{HDR_IMG_COMMENT_OPEN}
 	background-image:url({HDR_BG_IMG});
 	background-repeat: {HDR_BG_STYLE};
 	background-position: {HDR_BG_POSITION};
+{HDR_IMG_COMMENT_CLOSE}
 	font-weight:bold;
 	margin-bottom: 4px;
 	padding: 0 10px;
@@ -51,9 +53,11 @@
 	font-size: {BLK_FONT_SIZE}px;
 	color: {BLK_FONT_COLOR};
 	background-color: {BLK_BG_COLOR};
+{BLK_IMG_COMMENT_OPEN}
 	background-image:url({BLK_BG_IMG});
 	background-repeat: {BLK_BG_STYLE};
 	background-position: {BLK_BG_POSITION};
+{BLK_IMG_COMMENT_CLOSE}
 	margin-bottom: .8%;
 	padding: 0 10px;
 }
@@ -72,10 +76,11 @@
 	-khtml-opacity: 0.{GEN_BG_OPACITY};
 	-moz-opacity: 0.{GEN_BG_OPACITY};
 {GEN_OPACITY_COMMENT_CLOSE}
+	zoom: 1;
 }
 .no-drop { margin-top:-1px; }
 
-.bhdr a {
+.bhdr a:link {
   color:{HDR_LINK_COLOR};
   text-decoration:{HDR_TXT_DECOR};
 }
@@ -83,7 +88,7 @@
   color:{HDR_HOV_COLOR};
   text-decoration:{HDR_HOV_DECOR};
 }
-.bbody a {
+.bbody a:link {
   color:{BLK_LINK_COLOR};
   text-decoration:{BLK_TXT_DECOR};
 }
@@ -96,11 +101,11 @@
 .bbody hr {color:{BLK_BORDER_COLOR};}
 img {position:relative;}
 #signature {text-align:center;}
-#left {margin-right:.8%;}
-#right {margin-left:.8%;}
-#center {margin:0px}
+#left {margin-right:.7%; display: inline-block;}
+#right {margin-left:.7%; display: inline-block;}
+#center {margin:0px; zoom: 1;}
 #left,#right,#center {height:100%;min-height:25px;width:100%;};
-h4 {float:left;}
+h4 {float:left; min-width:90%;}
 form {display:inline;}
 #cs_nav_menu {float:right;margin:0px;margin-top:-2px;width:100%;display:block;white-space:nowrap;}
 .row1 {background-color:{BLK_BG_COLOR};color:{BLK_FONT_COLOR};border:{GEN_BORDER}px solid {GEN_BORDER_COLOR};}

Modified: mods/cms/trunk/modules/cs/template/stylegenerator.css
===================================================================
--- mods/cms/trunk/modules/cs/template/stylegenerator.css	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/modules/cs/template/stylegenerator.css	2007-10-13 20:11:58 UTC (rev 69)
@@ -15,11 +15,11 @@
 	cursor:auto;
 	z-index:2500;
 }
-#ifxElement input {width:60px;font-style:uppercase;}
 #list1 {width:100%;max-width:100%;height:auto;position:relative;}
 #list1 .title {line-height:100%;border:1px solid #CCCCCC;background-color:B5EF59;margin-top:0.5em; padding:0.1em;cursor:pointer;}
 #list1 .content { display:inset;height:auto;background-color:#B5CEFE; padding:0.1em; padding-top:10px; border:1px solid #b5c;margin:0;position:relative; }
-#colorpicker {display:none;width:300px;}
+#colorpicker {display:none;width:305px;}
+#bgpicker {display:none;background-color:#344;border: 2px solid #000000; z-index:2500;}
 #picker {float:left;padding:5px;width:200px;}
 #pickertitle {padding:4px;margin:0px;color:#fff;text-align:right;background-color:#667;width:292px;}
 #pickeroptions {float:left;display:block;margin:0px;padding:3px;width:75px;height:100%;border:1px solid #534;}
@@ -51,9 +51,8 @@
 }
 #myAccordion{
 	width: 100%;
+	height: 100%;
 	border: 1px solid #6CAF00;
-	position: relative;
-	z-index: 45;
 }
 #myAccordion dt{
 	line-height: 20px;

Modified: mods/cms/trunk/modules/zebra/template/pro_zebra.html
===================================================================
--- mods/cms/trunk/modules/zebra/template/pro_zebra.html	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/modules/zebra/template/pro_zebra.html	2007-10-13 20:11:58 UTC (rev 69)
@@ -1,3 +1,4 @@
+<div style="display:block; margin-left:auto; margin-right:auto; text-align: center;">
 <!-- BEGIN friends -->
 	<div class="connection">
 		<a href="{friends.U_PROFILE}"><span<!-- IF friends.USERNAME_COLOR --> {friends.USERNAME_COLOR}<!-- ENDIF -->>{friends.USERNAME}</span></a>
@@ -10,6 +11,7 @@
 		</div>
 	</div>
 <!-- BEGINELSE -->
-	<div style="text-align:center">{L_NO_FRIENDS}</div>
+	{L_NO_FRIENDS}
 <!-- END friends -->
+</div>
 <br clear="all" />

Modified: mods/cms/trunk/styles/prosilver/template/cs_generator.html
===================================================================
--- mods/cms/trunk/styles/prosilver/template/cs_generator.html	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/styles/prosilver/template/cs_generator.html	2007-10-13 20:11:58 UTC (rev 69)
@@ -1,3 +1,39 @@
+	<div class="panel bg2">
+		<div class="inner"><span class="corners-top"><span></span></span>
+
+			<!-- IF PREVIEW_OPTIONS -->
+				<form method="post">
+				<fieldset class="submit-buttons right-box">
+					{L_PREVIEW_AS}: <select name="user_perm">{PREVIEW_OPTIONS}</select>&nbsp;
+					{HIDDEN_FIELDS}<input type="submit" name="preview" id="preview" value="{L_SUBMIT}" class="button1" />
+				</fieldset>
+				</form>
+			<!-- ENDIF -->
+
+			<hr clear="both">
+
+				<!-- IF BLOCK_OPTIONS -->
+					<form method="post"{S_MAX_BLOCKS}>
+					<fieldset class="submit-buttons left-box">
+						<select name="block">{BLOCK_OPTIONS}</select> 
+						<select name="side">
+							<!-- IF S_LEFT --><option value="l">{L_LEFT}</option><!-- ENDIF -->
+							<option value="c">{L_CENTER}</option>
+							<!-- IF S_RIGHT --><option value="r">{L_RIGHT}</option><!-- ENDIF -->
+						</select>
+						{HIDDEN_FIELDS}<input type="submit" name="add_block" id="add_block" value="{L_SUBMIT}" class="button1" />
+					</fieldset>
+					<input type="hidden" name="action" value="add">
+					</form>
+				<!-- ENDIF -->
+
+				<fieldset class="submit-buttons right-box">
+					<input type="button" name="customize" id="customize"  onClick="$('#ifxElement').FoldToggle(500, 20);" value="{L_CUSTOMIZE}" class="button1" />&nbsp;
+					<input type="button" name="save" id="save" style="display:none;" value="{L_SAVE_CHANGES}" class="button1" />
+				</fieldset>
+		<span class="corners-bottom"><span></span></span></div>
+	</div>
+
 <div id="ifxElement">
 	<form method="post" name="generator" id="generator">
      <input type="hidden" name="action" value="save_changes" />
@@ -15,7 +51,7 @@
 					<span class="hh">Color:</span> <input type="text" size="7"  maxlength="7" id="border_color" name="border_color" value="{BORDER_COLOR}"> <a href="javascript:;" onmousedown="pickcolor('border_color', '#container', 'borderColor');" title="{L_COLOR_PICKER}"><img src="{ROOT_PATH}modules/cs/images/color.gif" alt="{L_COLOR_PICKER}" title="{L_COLOR_PICKER}"></a>
 				</p>
 				<p><span class="hh">Background Color:</span> <input type="text" size="7"  maxlength="7" id="bg_color" name="bg_color" value="{BG_COLOR}"> <a href="javascript:;" onmousedown="pickcolor('bg_color','#container','backgroundColor');" title="{L_COLOR_PICKER}"><img src="{ROOT_PATH}modules/cs/images/color.gif" alt="{L_COLOR_PICKER}" title="{L_COLOR_PICKER}"></a></p>
-				<p><span class="hh">Background Image:</span> <input type="text" size="25" id="bg_img" name="bg_img" value="{BG_IMG}" onBlur="changecss('#container', 'backgroundImage', 'url('+this.value+')');"> <a href="#" onClick="album_popup('#container', 'bg_img','bg_select_link','bg_select');" id="bg_select_link">Select</a></p>
+				<p><span class="hh">Background Image:</span> <input type="text" size="25" id="bg_img" name="bg_img" value="{BG_IMG}" onBlur="changecss('#container', 'backgroundImage', 'url('+this.value+')');"> <a href="javascript:;" id="bg_img_link" onmousedown="pickbg('bg_img', '#container');">Select</a></p>
 				<p><span class="hh">Background Attachment:</span> <select name="bg_attachment" onChange="changecss('#container', 'backgroundAttachment', this.value);">{BG_ATTACH_OPTIONS}</select>  <span id="opacity" class="hh">Opacity: <select name="bg_opacity" onChange="changecss('.drop', 'opacity', '0.'+this.value+'; -moz-opacity:0.'+this.value+'; filter:alpha(opacity='+this.value+')');">{BG_OPACITY_OPTIONS}</select></span></p>
 				<p><span class="hh">Background Style</span> <select name="bg_style" onChange="toggleBgStyle('body', this.value, '#dyn_position');">{BG_STYLE_OPTIONS}</select></p>
 				   <div id="dyn_position" style="display:none; margin-right:250px;"><p align="right">{BG_POSITION_OPTIONS}</p></div>
@@ -35,7 +71,7 @@
 					<span class="hh">Color:</span> <input type="text" size="7"  maxlength="7" id="hdr_border_color" name="hdr_border_color" value="{HDR_BORDER_COLOR}"> <a href="javascript:;" onmousedown="pickcolor('hdr_border_color','.bhdr','borderColor')" title="{L_COLOR_PICKER}"><img src="{ROOT_PATH}modules/cs/images/color.gif" alt="{L_COLOR_PICKER}" title="{L_COLOR_PICKER}"></a>
 				</p>
 				<p><span class="hh">Background Color:</span> <input type="text" size="7"  maxlength="7" id="hdr_bg_color" name="hdr_bg_color" value="{HDR_BG_COLOR}"> <a href="javascript:;" onmousedown="pickcolor('hdr_bg_color','.bhdr','backgroundColor');" title="{L_COLOR_PICKER}"><img src="{ROOT_PATH}modules/cs/images/color.gif" alt="{L_COLOR_PICKER}" title="{L_COLOR_PICKER}"></a></p>
-				<p><span class="hh">Background Image:</span> <input type="text" name="hdr_bg_img" value="{HDR_BG_IMG}" onBlur="changecss('.bhdr', 'backgroundImage', 'url('+this.value+')');"></p>
+				<p><span class="hh">Background Image:</span> <input type="text" id="hdr_bg_img" name="hdr_bg_img" value="{HDR_BG_IMG}" onBlur="changecss('.bhdr', 'backgroundImage', 'url('+this.value+')');"> <a href="javascript:;" id="hdr_bg_img_link" onmousedown="pickbg('hdr_bg_img', '.bhdr');">Select</a></p>
 				<p><span class="hh">Background Style:</span> <select name="hdr_bg_style" onChange="toggleBgStyle('.bhdr', this.value, '#dyn_hdr_position');">{HDR_BG_STYLE_OPTIONS}</select></p>
 				   <div id="dyn_hdr_position" style="display:none; margin-right:250px;"><p align="right">{HDR_BG_POSITION_OPTIONS}</p></div>
 				<p><span class="hh">{L_LINK_DECOR}:</span> <select name="hdr_txt_decor" onChange="changecss('.bhdr a', 'textDecoration', this.value);">{HDR_TXT_DECOR_OPTIONS}</select> 
@@ -57,7 +93,7 @@
 					<span class="hh">Color:</span> <input type="text" size="7"  maxlength="7" id="blk_border_color" name="blk_border_color" value="{BLK_BORDER_COLOR}"> <a href="javascript:;" onmousedown="pickcolor('blk_border_color','.bbody','borderColor');" title="{L_COLOR_PICKER}"><img src="{ROOT_PATH}modules/cs/images/color.gif" alt="{L_COLOR_PICKER}" title="{L_COLOR_PICKER}"></a>
 				</p>
 				<p><span class="hh">Background Color:</span> <input type="text" size="7"  maxlength="7" id="blk_bg_color" name="blk_bg_color" value="{BLK_BG_COLOR}"> <a href="javascript:;" onmousedown="pickcolor('blk_bg_color','.bbody','backgroundColor');" title="{L_COLOR_PICKER}"><img src="{ROOT_PATH}modules/cs/images/color.gif" alt="{L_COLOR_PICKER}" title="{L_COLOR_PICKER}"></a></p>
-				<p><span class="hh">Background Image:</span> <input type="text" name="blk_bg_img" value="{BLK_BG_IMG}" onBlur="changecss('.bbody', 'backgroundImage', 'url('+this.value+')');"></p>
+				<p><span class="hh">Background Image:</span> <input type="text" id="blk_bg_img" name="blk_bg_img" value="{BLK_BG_IMG}" onBlur="changecss('.bbody', 'backgroundImage', 'url('+this.value+')');"> <a href="javascript:;" id="blk_bg_img_link" onmousedown="pickbg('blk_bg_img', '.bbody');">Select</a></p>
 				<p><span class="hh">Background Style</span> <select name="blk_bg_style" onChange="toggleBgStyle('.bbody', this.value, '#dyn_blk_position');">{BLK_BG_STYLE_OPTIONS}</select></p>
 				   <div id="dyn_blk_position" style="display:none; margin-right:250px;"><p align="right">{BLK_BG_POSITION_OPTIONS}</p></div>
 				<p>
@@ -82,7 +118,6 @@
 				<p><label for="track_color"><span class="hh">{L_TRACK_COLOR}:</span></label> <input type="text" size="7"  maxlength="7" id="track_color" name="track_color" value="{TRACK_COLOR}"> <a href="javascript:;" onmousedown="pickcolor('track_color','body', 'scrollbarTrackColor');" title="{L_COLOR_PICKER}"><img src="{ROOT_PATH}modules/cs/images/color.gif" alt="{L_COLOR_PICKER}" title="{L_COLOR_PICKER}"></a></p>
 			</dd>
 	</dl>
-	<br class="clear" />
 
 	<fieldset class="submit-buttons">
 		<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
@@ -90,29 +125,48 @@
 	</fieldset>
 
 	</form>
-	<br />
+
 	<div id="colorpicker">
 		<div id="pickertitle"><a href="#" class="closePicker">X</a></div>
 		<div id="picker"></div>
 		<div id="pickeroptions">
 			<input type="text" id="pickercolor" size="7"  maxlength="7" value="#123456" /><br />
 			<input type="button" value="{L_SELECT}" onClick="selectColor();" />
-			<input type="button" class="closePicker" value="{L_CANCEL}" />
+			<input type="button" id="closeColorPicker" value="{L_CANCEL}" />
 		</div>
 	</div>
+
+	<div id="bgpicker">
+		<select multiple size="12" id="bg_options" name="bg_options"><option value="">{L_NONE}</option>{BG_IMG_OPTIONS}</select><br />
+		<input type="button" id="selectBg" value="{L_SELECT}" />
+		<input type="button" id="closeBgPicker" value="{L_CANCEL}" />
+	</div>
 </div>
 
 <script type="text/javascript" charset="utf-8">
 $(document).ready(
      function() {
 		$('#save').show().click(function(){ serializeBlocks(); });
-          $('.closePicker').click(function() { closePicker(); });     
+          $('#closeColorPicker').click(function() { closeColorPicker(); });     
           $('#myAccordion').Accordion({headerSelector:'dt', panelSelector:'dd', activeClass:'myAccordionActive', hoverClassn:'myAccordionHover', panelHeight:350, speed:300});
-          $('.bhdr').hover(function(){$(this).css('cursor','move');},function(){$(this).css('cursor', '{MAIN_POINTER}');});
+          $('.sortable .bhdr h4').hover(function(){$(this).css('cursor','move');},function(){$(this).css('cursor', '{MAIN_POINTER}');});
 	    $('.arrows').hide();
-          $('#left').Sortable({accept:'sortable',handle:'.bhdr', activeclass:'sortableactive', hoverclass:'sortablehover', helperclass:'sorthelper', float: true, opacity:0.7, revert:true, tolerance:'intersect', cursorAt:{left:20,top:20}});
-          $('#center').Sortable({accept:'sortable',handle:'.bhdr', activeclass:'sortableactive', hoverclass:'sortablehover', helperclass:'sorthelper', float: true, opacity:0.7, revert:true, tolerance:'intersect', cursorAt:{left:20,top:20}});
-          $('#right').Sortable({accept:'sortable',handle:'.bhdr', activeclass:'sortableactive', hoverclass:'sortablehover', helperclass:'sorthelper', float: true, opacity:0.7, revert:true, tolerance:'intersect', cursorAt:{left:20,top:20}});
+          $('#left').Sortable({accept:'sortable',handle:'.bhdr', activeclass:'sortableactive', hoverclass:'sortablehover', helperclass:'sorthelper', float: true, opacity:0.7, revert:true, fit:false, tolerance:'intersect', cursorAt:{left:20,top:20}});
+          $('#center').Sortable({accept:'sortable',handle:'.bhdr', activeclass:'sortableactive', hoverclass:'sortablehover', helperclass:'sorthelper', float: true, opacity:0.7, revert:true, fit:false, tolerance:'intersect', cursorAt:{left:20,top:20}});
+          $('#right').Sortable({accept:'sortable',handle:'.bhdr', activeclass:'sortableactive', hoverclass:'sortablehover', helperclass:'sorthelper', float: true, opacity:0.7, revert:true, fit:false, tolerance:'intersect', cursorAt:{left:20,top:20}});
      }
 );
+$(window).bind('load', function() {
+	var preload = new Array();
+	var img = document.createElement('img');
+	$('#bg_options > option').each(function() {
+		s = $(this).val();
+		preload.push(s);
+	});
+	$(img).bind('load', function() {
+		if(preload[0]) {
+			this.src = preload.shift();
+		}
+	}).trigger('load');
+});
 </script>
\ No newline at end of file

Modified: mods/cms/trunk/styles/prosilver/template/custom_style_view.html
===================================================================
--- mods/cms/trunk/styles/prosilver/template/custom_style_view.html	2007-10-13 15:03:02 UTC (rev 68)
+++ mods/cms/trunk/styles/prosilver/template/custom_style_view.html	2007-10-13 20:11:58 UTC (rev 69)
@@ -4,45 +4,6 @@
 
 	<!-- INCLUDE cs_generator.html -->
 
-	<div class="panel bg2">
-		<div class="inner"><span class="corners-top"><span></span></span>
-
-			<div class="left-box" style="width:20%;">
-				<!-- IF BLOCK_OPTIONS -->
-					<form method="post"{S_MAX_BLOCKS}>
-					<fieldset class="submit-buttons">
-						<select name="block">{BLOCK_OPTIONS}</select> 
-						<select name="side">
-							<!-- IF S_LEFT --><option value="l">{L_LEFT}</option><!-- ENDIF -->
-							<option value="c">{L_CENTER}</option>
-							<!-- IF S_RIGHT --><option value="r">{L_RIGHT}</option><!-- ENDIF -->
-						</select>
-						{HIDDEN_FIELDS}<input type="submit" name="submit" id="submit" value="{L_SUBMIT}" class="button1" />
-					</fieldset>
-					<input type="hidden" name="action" value="add">
-					</form>
-				<!-- ENDIF -->
-			</div>
-
-			<div class="left-box" style="width:55%;">
-				<fieldset class="submit-buttons">
-					<input type="button" name="save" id="save" style="display:none;" value="{L_SAVE_CHANGES}" class="button1" />
-				</fieldset>
-			</div>
-
-			<!-- IF PREVIEW_OPTIONS -->
-			<div class="left-box" style="width:25%;">
-				<form method="post">
-				<fieldset class="submit-buttons">
-					{L_PREVIEW_AS}: <select name="user_perm">{PREVIEW_OPTIONS}</select>&nbsp;
-					{HIDDEN_FIELDS}<input type="submit" name="submit" id="submit" value="{L_SUBMIT}" class="button1" />
-				</fieldset>
-				</form>
-			</div>
-			<!-- ENDIF -->
-		<span class="corners-bottom"><span></span></span></div>
-	</div>
-
 <!-- ENDIF -->
 
 <div class="panel" id="container">
@@ -55,13 +16,12 @@
 	<!-- IF .t_block2 > 1 -->
 		<!-- BEGIN t_block2 -->
 			<!-- IF t_block2.S_SELECTED -->
-				<li class="activetab"><a href="{t_block2.U_TITLE}"><b><span class="tabbg">{t_block2.L_TITLE}</span><b><em></em></a></li>
+				<li class="activetab"><a href="{t_block2.U_TITLE}"><b><span class="tabbg">{t_block2.L_TITLE}</span><b></a></li>
 			<!-- ELSE -->
-				<li><a href="{t_block2.U_TITLE}"><b><span class="tabbg">{t_block2.L_TITLE}</span><b><em></em></a></li>
+				<li><a href="{t_block2.U_TITLE}"><b><span class="tabbg">{t_block2.L_TITLE}</span><b></a></li>
 			<!-- ENDIF -->
 		<!-- END t_block2 -->
 	<!-- ENDIF -->
-	<!-- IF U_CUSTOMIZE --><li><a href="javascript:void(0);" onClick="$('#ifxElement').FoldToggle(500, 20);"><b><span>{L_CUSTOMIZE}</span><b><em></em></a></li><!-- ENDIF -->
 	</ul>
 </div>
 <br clear="both" />
@@ -71,12 +31,18 @@
 
 		<!-- IF S_MODE eq 'viewprofile' -->
 		<div class="bcontainer" id="avatar">
+			<div class="drop">
+				<div class="bhdr">
+					<div class="inner"><span class="corners-top"><span></span></span>
+						<h4>{USERNAME}</h4>
+					<span class="corners-bottom"><span></span></span></div>		
+				</div>
+			</div>
 			<div class="{SEPARATOR} shadow">
-				<div class="bbody top_border<!-- IF ONLINE_IMG --> online<!-- ENDIF -->">
+				<div class="bbody top_border<!-- IF S_ONLINE --> online<!-- ENDIF -->">
 					<div class="inner"><span class="corners-top"><span></span></span>
 
 						<dl class="left-box">
-							<span>{USERNAME}</span>
 							<dt>{AVATAR_IMG}</dt>
 							<!-- IF RANK_TITLE --><dd style="text-align: center;">{RANK_TITLE}</dd><!-- ENDIF -->
 							<!-- IF RANK_IMG --><dd style="text-align: center;">{RANK_IMG}</dd><!-- ENDIF -->
@@ -382,4 +348,4 @@
 
 </div>
 
-<!-- INCLUDE overall_footer.html -->
+<!-- INCLUDE overall_footer.html -->
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.