gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 08:55:54 +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-04-22 14:38:51 +02:00
commit f55db469c7
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -200,6 +200,7 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.23 Changes in version 5.1.23
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- output path of parent folder in many document/folder lists
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.22 Changes in version 5.1.22

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

@ -1262,14 +1262,22 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
return; return;
} /* }}} */ } /* }}} */
function formSubmit($value, $name='', $target='') { /* {{{ */ function formSubmit($value, $name='', $target='', $type='primary') { /* {{{ */
switch($type) {
case 'danger':
$class = 'btn-danger';
break;
case 'primary':
default:
$class = 'btn-primary';
}
echo "<div class=\"controls\">\n"; echo "<div class=\"controls\">\n";
if(is_string($value)) { if(is_string($value)) {
echo "<button type=\"submit\" class=\"btn btn-primary\"".($name ? ' name="'.$name.'" id="'.$name.'"' : '').($target ? ' formtarget="'.$target.'"' : '').">".$value."</button>\n"; echo "<button type=\"submit\" class=\"btn ".$class."\"".($name ? ' name="'.$name.'" id="'.$name.'"' : '').($target ? ' formtarget="'.$target.'"' : '').">".$value."</button>\n";
} else { } else {
if(is_array($value)) { if(is_array($value)) {
foreach($value as $i=>$v) foreach($value as $i=>$v)
echo "<button type=\"submit\" class=\"btn btn-primary\"".(!empty($name[$i]) ? ' name="'.$name[$i].'" id="'.$name[$i].'"' : '').(!empty($target[$i]) ? ' formtarget="'.$name[$i].'"' : '').">".$v."</button>\n"; echo "<button type=\"submit\" class=\"btn ".$class."\"".(!empty($name[$i]) ? ' name="'.$name[$i].'" id="'.$name[$i].'"' : '').(!empty($target[$i]) ? ' formtarget="'.$name[$i].'"' : '').">".$v."</button>\n";
} }
} }
echo "</div>\n"; echo "</div>\n";

14
views/bootstrap4/class.Bootstrap4.php
View File

@ -1178,14 +1178,22 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
return; return;
} /* }}} */ } /* }}} */
function formSubmit($value, $name='', $target='') { /* {{{ */ function formSubmit($value, $name='', $target='', $type='primary') { /* {{{ */
switch($type) {
case 'danger':
$class = 'btn-danger';
break;
case 'primary':
default:
$class = 'btn-primary';
}
// echo "<div class=\"controls\">\n"; // echo "<div class=\"controls\">\n";
if(is_string($value)) { if(is_string($value)) {
echo "<button type=\"submit\" class=\"btn btn-primary\"".($name ? ' name="'.$name.'" id="'.$name.'"' : '').($target ? ' formtarget="'.$target.'"' : '').">".$value."</button>\n"; echo "<button type=\"submit\" class=\"btn ".$class."\"".($name ? ' name="'.$name.'" id="'.$name.'"' : '').($target ? ' formtarget="'.$target.'"' : '').">".$value."</button>\n";
} else { } else {
if(is_array($value)) { if(is_array($value)) {
foreach($value as $i=>$v) foreach($value as $i=>$v)
echo "<button type=\"submit\" class=\"btn btn-primary\"".(!empty($name[$i]) ? ' name="'.$name[$i].'" id="'.$name[$i].'"' : '').(!empty($target[$i]) ? ' formtarget="'.$name[$i].'"' : '').">".$v."</button>\n"; echo "<button type=\"submit\" class=\"btn ".$class."\"".(!empty($name[$i]) ? ' name="'.$name[$i].'" id="'.$name[$i].'"' : '').(!empty($target[$i]) ? ' formtarget="'.$name[$i].'"' : '').">".$v."</button>\n";
} }
} }
// echo "</div>\n"; // echo "</div>\n";