gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-24 10:31:20 +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-05-03 17:49:43 +02:00
commit 90f849c801
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
views/bootstrap/class.DefaultKeywords.php
View File

@ -144,13 +144,13 @@ $(document).ready( function() {
function showKeywordForm($category, $user) { /* {{{ */ function showKeywordForm($category, $user) { /* {{{ */
if(!$category) { if(!$category) {
$this->contentContainerStart();
?> ?>
<form class="form-horizontal" action="../op/op.DefaultKeywords.php" method="post" id="form"> <form class="form-horizontal" action="../op/op.DefaultKeywords.php" method="post" id="form">
<?php echo createHiddenFieldWithKey('addcategory'); ?> <?php echo createHiddenFieldWithKey('addcategory'); ?>
<input type="hidden" name="action" value="addcategory"> <input type="hidden" name="action" value="addcategory">
<?php <?php
$this->contentContainerStart();
$this->formField( $this->formField(
getMLText("name"), getMLText("name"),
array( array(
@ -160,11 +160,11 @@ $(document).ready( function() {
'value'=>'' 'value'=>''
) )
); );
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('new_default_keyword_category')); $this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('new_default_keyword_category'));
?> ?>
</form> </form>
<?php <?php
$this->contentContainerEnd();
} else { } else {
$owner = $category->getOwner(); $owner = $category->getOwner();
if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) return; if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) return;
@ -172,6 +172,7 @@ $(document).ready( function() {
<form class="form-horizontal form" action="../op/op.DefaultKeywords.php" method="post"> <form class="form-horizontal form" action="../op/op.DefaultKeywords.php" method="post">
<?php echo createHiddenFieldWithKey('editcategory'); ?> <?php echo createHiddenFieldWithKey('editcategory'); ?>
<input type="hidden" name="action" value="editcategory"> <input type="hidden" name="action" value="editcategory">
<input type="hidden" name="categoryid" value="<?= $category->getId() ?>">
<?php <?php
$this->contentContainerStart(); $this->contentContainerStart();
$this->formField( $this->formField(
@ -224,7 +225,7 @@ $(document).ready( function() {
<?php echo createHiddenFieldWithKey('newkeywords'); ?> <?php echo createHiddenFieldWithKey('newkeywords'); ?>
<input type="Hidden" name="action" value="newkeywords"> <input type="Hidden" name="action" value="newkeywords">
<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>"> <input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input type="text" class="keywords form-control" name="keywords"> <input type="text" class="keywords form-control" name="keywords">&nbsp;
<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("new_default_keywords");?></button> <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("new_default_keywords");?></button>
</form> </form>
</div> </div>

10
views/bootstrap/class.ExtensionMgr.php
View File

@ -194,11 +194,11 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
$extmgr->checkExtension($extname); $extmgr->checkExtension($extname);
$errmsgs = $extmgr->getErrorMsgs(); $errmsgs = $extmgr->getErrorMsgs();
if($errmsgs) if($errmsgs)
echo "<tr class=\"error\" ref=\"".$extname."\">"; echo "<tr class=\"table-danger error\" ref=\"".$extname."\">";
else else
echo "<tr class=\"success\" ref=\"".$extname."\">"; echo "<tr class=\"table-success success\" ref=\"".$extname."\">";
} else { } else {
echo "<tr class=\"warning\" ref=\"".$extname."\">"; echo "<tr class=\"table-warning warning\" ref=\"".$extname."\">";
} }
echo "<td width=\"32\">"; echo "<td width=\"32\">";
if($extconf['icon']) if($extconf['icon'])
@ -310,9 +310,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
echo "<tr"; echo "<tr";
if(isset($extconf[$re['name']])) { if(isset($extconf[$re['name']])) {
if($needsupdate) if($needsupdate)
echo " class=\"warning\""; echo " class=\"table-warning warning\"";
else else
echo " class=\"success\""; echo " class=\"table-success success\"";
} }
echo ">"; echo ">";
echo "<td width=\"32\">".($re['icon-data'] ? '<img width="32" height="32" alt="'.$re['name'].'" title="'.$re['name'].'" src="'.$re['icon-data'].'">' : '')."</td>"; echo "<td width=\"32\">".($re['icon-data'] ? '<img width="32" height="32" alt="'.$re['name'].'" title="'.$re['name'].'" src="'.$re['icon-data'].'">' : '')."</td>";

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

@ -564,7 +564,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$content .= " <div class=\"dropdown-divider\"></div>\n"; $content .= " <div class=\"dropdown-divider\"></div>\n";
} else { } else {
$content .= " <li class=\"nav-item\">\n"; $content .= " <li class=\"nav-item\">\n";
$content .= "<a class=\"nav-link".(isset($menuitem['class']) ? " ".$menuitem['class'] : "")."\" href=\"".$menuitem['link']."\"".(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : ''); $content .= "<a class=\"nav-link".(isset($menuitem['class']) ? " ".$menuitem['class'] : "")."\"".(isset($menuitem['link']) ? " href=\"".$menuitem['link']."\"" : "").(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : '');
if(!empty($menuitem['attributes'])) if(!empty($menuitem['attributes']))
foreach($menuitem['attributes'] as $attr) foreach($menuitem['attributes'] as $attr)
$content .= ' '.$attr[0].'="'.$attr[1].'"'; $content .= ' '.$attr[0].'="'.$attr[1].'"';