From 5203205680e9c7d24da62558f28a7d2b2988a199 Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Thu, 20 Jan 2011 18:38:24 +0000
Subject: [PATCH] Improved formatting of options and help.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3229 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/skins/classic/css/skin.css         | 4 ++++
 web/skins/classic/js/skin.js           | 4 ++--
 web/skins/classic/views/optionhelp.php | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/css/skin.css b/web/skins/classic/css/skin.css
index fda3f8c76..a4ccdad4e 100644
--- a/web/skins/classic/css/skin.css
+++ b/web/skins/classic/css/skin.css
@@ -330,6 +330,10 @@ div.clear {
     padding: 4px;
 }
 
+#content p.textblock br {
+    margin-bottom: 8px;
+}
+
 /*
 #contentDiv {
     margin: 0 auto 8px;
diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index a29ad660e..82eb628c6 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -67,8 +67,8 @@ var popupSizes = {
     'monitorprobe': { 'width': 500, 'height': 240 },
     'monitorselect':{ 'width': 160, 'height': 200 },
     'montage':      { 'width': -1, 'height': -1 },
-    'optionhelp':   { 'width': 320, 'height': 330 },
-    'options':      { 'width': 840, 'height': 620 },
+    'optionhelp':   { 'width': 400, 'height': 320 },
+    'options':      { 'width': 920, 'height': 620 },
     'preset':       { 'width': 300, 'height': 120 },
     'settings':     { 'width': 200, 'height': 225 },
     'state':        { 'width': 240, 'height': 124 },
diff --git a/web/skins/classic/views/optionhelp.php b/web/skins/classic/views/optionhelp.php
index 7b5fef1c1..5ac37527b 100644
--- a/web/skins/classic/views/optionhelp.php
+++ b/web/skins/classic/views/optionhelp.php
@@ -20,6 +20,8 @@
 
 $optionHelpIndex = preg_replace( '/^ZM_/', '', $_REQUEST['option'] );
 $optionHelpText = !empty($OLANG[$optionHelpIndex])?$OLANG[$optionHelpIndex]:$config[$_REQUEST['option']]['Help'];
+$optionHelpText = validHtmlStr($optionHelpText);
+$optionHelpText = preg_replace( "/~~/", "<br/>", $optionHelpText );
 
 $focusWindow = true;
 
@@ -35,7 +37,7 @@ xhtmlHeaders(__FILE__, $SLANG['OptionHelp'] );
     </div>
     <div id="content">
       <h3><?= validHtmlStr($_REQUEST['option']) ?></h3>
-      <p class="textblock"><?= validHtmlStr($optionHelpText) ?></p>
+      <p class="textblock"><?= $optionHelpText ?></p>
     </div>
   </div>
 </body>