[prev in list] [next in list] [prev in thread] [next in thread]
List: squirrelmail-cvs
Subject: [SM-CVS] SF.net SVN: squirrelmail:[14676] trunk/squirrelmail/functions/options.php
From: Paul Lesniewski via squirrelmail-cvs <squirrelmail-cvs () lists ! sourceforge ! net>
Date: 2017-06-12 8:15:08
Message-ID: 1497255308.888495.11705 () sfp-scm-5 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 14676
http://sourceforge.net/p/squirrelmail/code/14676
Author: pdontthink
Date: 2017-06-12 08:15:08 +0000 (Mon, 12 Jun 2017)
Log Message:
-----------
Add "trailing_text_small" flag for option widgets
Modified Paths:
--------------
trunk/squirrelmail/functions/options.php
Modified: trunk/squirrelmail/functions/options.php
===================================================================
--- trunk/squirrelmail/functions/options.php 2017-06-12 07:54:06 UTC (rev 14675)
+++ trunk/squirrelmail/functions/options.php 2017-06-12 08:15:08 UTC (rev 14676)
@@ -68,9 +68,15 @@
* useful for indicating units, meanings of special values, etc.
* @var string
*/
-//TODO: add trailing_text_small as has been done with 1.4.x
var $trailing_text;
/**
+ * Indicates that the widget's "trailing text"
+ * should be displayed in a smaller sized font
+ *
+ * @var boolean
+ */
+ var $trailing_text_small;
+ /**
* Text that overrides the "Yes" label for boolean
* radio option widgets
*
@@ -206,6 +212,7 @@
$this->htmlencoded = $htmlencoded;
$this->size = SMOPT_SIZE_NORMAL;
$this->trailing_text = '';
+ $this->trailing_text_small = FALSE;
$this->yes_text = '';
$this->no_text = '';
$this->comment = '';
@@ -306,6 +313,14 @@
}
/**
+ * Set the trailing_text for this option.
+ * @param string $trailing_text
+ */
+ function setTrailingTextSmall($trailing_text_small) {
+ $this->trailing_text_small = $trailing_text_small;
+ }
+
+ /**
* Set the yes_text for this option.
* @param string $yes_text
*/
@@ -520,11 +535,11 @@
$width = 25;
}
-//TODO: might be better to have a separate template file for all widgets, because \
then the layout of the widget and the "trailing text" can be customized - they are \
still hard coded here +//TODO: might be better to have a separate template file for \
all widgets, because then the layout of the widget and the "trailing text" can be \
customized - they are still hard coded here (also, we have <small> tags here; don't \
want HTML here!) if ($password)
- return addPwField('new_' . $this->name, $this->value, $width, 0, \
$this->aExtraAttribs) . ' ' . sm_encode_html_special_chars($this->trailing_text); + \
return addPwField('new_' . $this->name, $this->value, $width, 0, \
$this->aExtraAttribs) . ' ' . ($this->trailing_text_small ? '<small>' : '') . \
sm_encode_html_special_chars($this->trailing_text) . ($this->trailing_text_small ? \
'</small>' : ''); else
- return addInput('new_' . $this->name, $this->value, $width, 0, \
$this->aExtraAttribs) . ' ' . sm_encode_html_special_chars($this->trailing_text); + \
return addInput('new_' . $this->name, $this->value, $width, 0, $this->aExtraAttribs) \
. ' ' . ($this->trailing_text_small ? '<small>' : '') . \
sm_encode_html_special_chars($this->trailing_text) . ($this->trailing_text_small ? \
'</small>' : ''); }
/**
@@ -594,7 +609,7 @@
$height = 5;
}
- return addSelect('new_' . $this->name, $this->possible_values, $this->value, \
TRUE, $this->aExtraAttribs, $multiple_select, $height, !$this->htmlencoded) . \
sm_encode_html_special_chars($this->trailing_text); + return addSelect('new_' \
. $this->name, $this->possible_values, $this->value, TRUE, $this->aExtraAttribs, \
$multiple_select, $height, !$this->htmlencoded) . ($this->trailing_text_small ? \
'<small>' : '') . sm_encode_html_special_chars($this->trailing_text) . \
($this->trailing_text_small ? '</small>' : '');
}
@@ -652,7 +667,7 @@
$option_list = array('ignore' => _("unavailable"));
- return addSelect('new_' . $this->name, $option_list, $this->value, TRUE, \
$this->aExtraAttribs, $multiple_select, $height) . \
sm_encode_html_special_chars($this->trailing_text); + return addSelect('new_' \
. $this->name, $option_list, $this->value, TRUE, $this->aExtraAttribs, \
$multiple_select, $height) . ($this->trailing_text_small ? '<small>' : '') . \
sm_encode_html_special_chars($this->trailing_text) . ($this->trailing_text_small ? \
'</small>' : '');
}
@@ -733,7 +748,7 @@
// checkbox...
//
if ($checkbox) {
- $result = addCheckbox('new_' . $this->name, ($this->value != SMPREF_NO), \
SMPREF_YES, array_merge(array('id' => 'new_' . $this->name), $this->aExtraAttribs)) . \
$nbsp . create_label($this->trailing_text, 'new_' . $this->name); + \
$result = addCheckbox('new_' . $this->name, ($this->value != SMPREF_NO), SMPREF_YES, \
array_merge(array('id' => 'new_' . $this->name), $this->aExtraAttribs)) . $nbsp . \
create_label(($this->trailing_text_small ? '<small>' : '') . $this->trailing_text . \
($this->trailing_text_small ? '</small>' : ''), 'new_' . $this->name); }
// radio buttons...
@@ -815,6 +830,7 @@
$oTemplate->assign('use_delete_widget', $this->use_delete_widget);
$oTemplate->assign('trailing_text', $this->trailing_text);
+ $oTemplate->assign('trailing_text_small', $this->trailing_text_small);
$oTemplate->assign('possible_values', $this->possible_values);
$oTemplate->assign('current_value', $this->value);
$oTemplate->assign('select_widget', addSelect('new_' . $this->name, \
$this->possible_values, $this->value, FALSE, !checkForJavascript() ? \
$this->aExtraAttribs : array_merge(array('onchange' => 'if (typeof(window.addinput_' \
. $this->name . ') == \'undefined\') { var f = document.forms.length; var i = 0; var \
pos = -1; while( pos == -1 && i < f ) { var e = document.forms[i].elements.length; \
var j = 0; while( pos == -1 && j < e ) { if ( document.forms[i].elements[j].type == \
\'text\' && document.forms[i].elements[j].name == \'add_' . $this->name . '\' ) { pos \
= j; i=f-1; j=e-1; } j++; } i++; } if( pos >= 0 ) { window.addinput_' . $this->name . \
' = document.forms[i-1].elements[pos]; } } for (x = 0; x < this.length; x++) { if \
(this.options[x].selected) { window.addinput_' . $this->name . '.value = \
this.options[x].text; break; } }'), $this->aExtraAttribs), TRUE, $height)); @@ -895,6 \
+911,7 @@ $oTemplate->assign('aAttribs', $this->aExtraAttribs);
$oTemplate->assign('trailing_text', $this->trailing_text);
+ $oTemplate->assign('trailing_text_small', $this->trailing_text_small);
switch ($this->layout_type) {
case SMOPT_EDIT_LIST_LAYOUT_SELECT:
@@ -915,7 +932,7 @@
*/
function createWidget_Submit() {
- return addSubmit($this->comment, $this->name, $this->aExtraAttribs) . \
sm_encode_html_special_chars($this->trailing_text); + return \
addSubmit($this->comment, $this->name, $this->aExtraAttribs) . \
($this->trailing_text_small ? '<small>' : '') . \
sm_encode_html_special_chars($this->trailing_text) . ($this->trailing_text_small ? \
'</small>' : '');
}
@@ -1159,6 +1176,11 @@
$next_option->setTrailingText($optset['trailing_text']);
}
+ /* If provided, set the trailing_text_small for this option. */
+ if (isset($optset['trailing_text_small'])) {
+ $next_option->setTrailingTextSmall($optset['trailing_text_small']);
+ }
+
/* If provided, set the yes_text for this option. */
if (isset($optset['yes_text'])) {
$next_option->setYesText($optset['yes_text']);
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic