gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 13:11:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2021-09-09 08:19:51 +02:00
commit 753d808d2a
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/inc.ClassEmailNotify.php
View File

@ -220,7 +220,7 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
$ret = $queueService->queueMailJob($mail_params, $to, $hdrs, getMLText($subject, $params, "", $lang), $message); $ret = $queueService->queueMailJob($mail_params, $to, $hdrs, getMLText($subject, $params, "", $lang), $message);
if($ret !== null) if($ret !== null)
return $ret; return $ret;
} }
} }
} }
$result = $mail->send($to, $hdrs, $message); $result = $mail->send($to, $hdrs, $message);

2
views/bootstrap/class.Bootstrap.php
View File

@ -1187,7 +1187,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
function formField($title, $value, $params=array()) { /* {{{ */ function formField($title, $value, $params=array()) { /* {{{ */
if($title !== null) { if($title !== null) {
echo "<div class=\"control-group\">"; echo "<div class=\"control-group\">";
echo " <label class=\"control-label\"".(!empty($params['help']) ? " title=\"".$params['help']."\" style=\"cursor: help;\"" : "").">".$title.":</label>"; echo " <label class=\"control-label\"".(!empty($params['help']) ? " title=\"".$params['help']."\" style=\"cursor: help;\"" : "").(!empty($value['id']) ? ' for="'.$value['id'].'"' : '').">".$title.":</label>";
echo " <div class=\"controls\">"; echo " <div class=\"controls\">";
} }
if(isset($params['field_wrap'][0])) if(isset($params['field_wrap'][0]))

28
views/bootstrap/class.Login.php
View File

@ -148,27 +148,35 @@ $(document).ready( function() {
); );
} }
if($enableLanguageSelector) { if($enableLanguageSelector) {
$html = "<select id=\"languageselector\" class=\"form-control\" name=\"lang\">"; $options = array();
$html .= "<option value=\"\">-"; $options[] = array('', '-');
foreach ($languages as $currLang) { foreach ($languages as $currLang) {
$html .= "<option value=\"".$currLang."\">".getMLText($currLang)."</option>"; $options[] = array($currLang, getMLText($currLang));
} }
$html .= "</select>";
$this->formField( $this->formField(
getMLText("language"), getMLText("language"),
$html array(
'element'=>'select',
'name'=>'lang',
'id'=>'languageselector',
'options'=>$options
)
); );
} }
if($enableThemeSelector) { if($enableThemeSelector) {
$html = "<select id=\"themeselector\" class=\"form-control\" name=\"sesstheme\">"; $options = array();
$html .= "<option value=\"\">-"; $options[] = array('', '-');
foreach ($themes as $currTheme) { foreach ($themes as $currTheme) {
$html .= "<option value=\"".$currTheme."\">".$currTheme; $options[] = array($currTheme, $currTheme);
} }
$html .= "</select>";
$this->formField( $this->formField(
getMLText("theme"), getMLText("theme"),
$html array(
'element'=>'select',
'name'=>'sesstheme',
'id'=>'themeselector',
'options'=>$options
)
); );
} }
$this->formSubmit(getMLText('submit_login')); $this->formSubmit(getMLText('submit_login'));