gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 17:05:46 +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-06 15:08:55 +02:00
commit 8644e750e9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,7 @@ $(document).ready( function() {
</form>
<?php
$this->contentHeading(getMLText("default_keywords"));
$this->contentContainerStart();
// $this->contentContainerStart();
?>
<?php
$lists = $category->getKeywordLists();
@ -205,7 +205,7 @@ $(document).ready( function() {
<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
<input type="Hidden" name="action" value="editkeywords">
<input name="keywords" class="keywords form-control" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
<button class="btn btn-primary" title="<?php echo getMLText("save")?>"><i class="fa fa-save"></i> <?php echo getMLText("save")?></button>
<button class="btn btn-primary btn-mini btn-sm" title="<?php echo getMLText("save")?>"><i class="fa fa-save"></i> <?php echo getMLText("save")?></button>
<!-- <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
</form>
<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
@ -213,7 +213,7 @@ $(document).ready( function() {
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
<input type="hidden" name="action" value="removekeywords">
<button class="btn btn-danger" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php echo getMLText("delete")?></button>
<button class="btn btn-danger btn-mini btn-sm" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php echo getMLText("delete")?></button>
</form>
<br>
<?php } ?>
@ -232,7 +232,7 @@ $(document).ready( function() {
</div>
<?php
$this->contentContainerEnd();
// $this->contentContainerEnd();
}
} /* }}} */

6
views/bootstrap/class.Settings.php
View File

@ -32,7 +32,7 @@
class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
protected function showStartPaneContent($name, $isactive) { /* {{{ */
self::parent($name, $isactive);
parent::showStartPaneContent($name, $isactive);
$this->contentContainerStart();
echo '<table class="table-condensed table-sm" style="table-layout: fixed;">';
echo '<tr><td width="20%"></td><td width="80%"></td></tr>';
@ -41,7 +41,7 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
protected function showEndPaneContent($name, $currentab) { /* {{{ */
echo '</table>';
$this->contentContainerEnd();
self::parent($name, $isactive);
parent::showEndPaneContent($name, $isactive);
} /* }}} */
protected function getTextField($name, $value, $type='', $placeholder='') { /* {{{ */
@ -431,7 +431,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
<?php $this->showConfigText('settings_smtpSendFrom', 'smtpSendFrom'); ?>
<?php $this->showConfigText('settings_smtpUser', 'smtpUser'); ?>
<?php $this->showConfigText('settings_smtpPassword', 'smtpPassword', 'password'); ?>
<?php $this->showConfigPlain(htmlspecialchars(getMLText('settings_smtpSendTestMail')), htmlspecialchars(getMLText('settings_smtpSendTestMail_desc')), '<a class="btn sendtestmail">'.getMLText('send_test_mail').'</a><div><pre id="maildebug">You will see debug messages here</pre></div>'); ?>
<?php $this->showConfigPlain(htmlspecialchars(getMLText('settings_smtpSendTestMail')), htmlspecialchars(getMLText('settings_smtpSendTestMail_desc')), '<a class="btn btn-secondary sendtestmail">'.getMLText('send_test_mail').'</a><div><pre id="maildebug">You will see debug messages here</pre></div>'); ?>
<?php
$this->showEndPaneContent('system', $currenttab);