ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved formatting of options and help. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3229 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2011-01-20 18:38:24 +00:00
parent 08a5256cf4
commit 5203205680
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/skins/classic/css/skin.css
View File

@ -330,6 +330,10 @@ div.clear {
padding: 4px; padding: 4px;
} }
#content p.textblock br {
margin-bottom: 8px;
}
/* /*
#contentDiv { #contentDiv {
margin: 0 auto 8px; margin: 0 auto 8px;

4
web/skins/classic/js/skin.js
View File

@ -67,8 +67,8 @@ var popupSizes = {
'monitorprobe': { 'width': 500, 'height': 240 }, 'monitorprobe': { 'width': 500, 'height': 240 },
'monitorselect':{ 'width': 160, 'height': 200 }, 'monitorselect':{ 'width': 160, 'height': 200 },
'montage': { 'width': -1, 'height': -1 }, 'montage': { 'width': -1, 'height': -1 },
'optionhelp': { 'width': 320, 'height': 330 }, 'optionhelp': { 'width': 400, 'height': 320 },
'options': { 'width': 840, 'height': 620 }, 'options': { 'width': 920, 'height': 620 },
'preset': { 'width': 300, 'height': 120 }, 'preset': { 'width': 300, 'height': 120 },
'settings': { 'width': 200, 'height': 225 }, 'settings': { 'width': 200, 'height': 225 },
'state': { 'width': 240, 'height': 124 }, 'state': { 'width': 240, 'height': 124 },

4
web/skins/classic/views/optionhelp.php
View File

@ -20,6 +20,8 @@
$optionHelpIndex = preg_replace( '/^ZM_/', '', $_REQUEST['option'] ); $optionHelpIndex = preg_replace( '/^ZM_/', '', $_REQUEST['option'] );
$optionHelpText = !empty($OLANG[$optionHelpIndex])?$OLANG[$optionHelpIndex]:$config[$_REQUEST['option']]['Help']; $optionHelpText = !empty($OLANG[$optionHelpIndex])?$OLANG[$optionHelpIndex]:$config[$_REQUEST['option']]['Help'];
$optionHelpText = validHtmlStr($optionHelpText);
$optionHelpText = preg_replace( "/~~/", "<br/>", $optionHelpText );
$focusWindow = true; $focusWindow = true;
@ -35,7 +37,7 @@ xhtmlHeaders(__FILE__, $SLANG['OptionHelp'] );
</div> </div>
<div id="content"> <div id="content">
<h3><?= validHtmlStr($_REQUEST['option']) ?></h3> <h3><?= validHtmlStr($_REQUEST['option']) ?></h3>
<p class="textblock"><?= validHtmlStr($optionHelpText) ?></p> <p class="textblock"><?= $optionHelpText ?></p>
</div> </div>
</div> </div>
</body> </body>