gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-31 13:18:06 +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-01 14:51:12 +02:00
commit 539b5b02eb
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
views/bootstrap/class.AttributeMgr.php
View File

@ -194,6 +194,7 @@ $(document).ready( function() {
<input type="hidden" name="action" value="addattrdef">
<?php
}
$this->contentContainerStart();
$this->formField(
getMLText("attrdef_name"),
array(
@ -302,6 +303,7 @@ $(document).ready( function() {
),
['help'=>getMLText('attrdef_regex_help')]
);
$this->contentContainerEnd();
$this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'));
?>
</form>
@ -404,12 +406,10 @@ $(document).ready( function() {
$this->columnEnd();
$this->columnStart(6);
?>
<?php $this->contentContainerStart(); ?>
<?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
<div class="ajax" data-view="AttributeMgr" data-action="form" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
<?php } ?>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();

4
views/bootstrap/class.Categories.php
View File

@ -115,6 +115,7 @@ $(document).ready( function() {
<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
<?php } ?>
<?php
$this->contentContainerStart();
$this->formField(
getMLText("name"),
array(
@ -124,6 +125,7 @@ $(document).ready( function() {
'value'=>($category ? htmlspecialchars($category->getName()) : '')
)
);
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
?>
</form>
@ -170,11 +172,9 @@ $(document).ready( function() {
<?php
$this->columnEnd();
$this->columnStart(6);
$this->contentContainerStart();
?>
<div class="ajax" data-view="Categories" data-action="form" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();

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

@ -166,7 +166,6 @@ $(document).ready( function() {
<?php
$this->contentContainerEnd();
} else {
$this->contentContainerStart();
$owner = $category->getOwner();
if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) return;
?>
@ -174,6 +173,7 @@ $(document).ready( function() {
<?php echo createHiddenFieldWithKey('editcategory'); ?>
<input type="hidden" name="action" value="editcategory">
<?php
$this->contentContainerStart();
$this->formField(
getMLText("name"),
array(
@ -183,11 +183,11 @@ $(document).ready( function() {
'value'=>$category->getName()
)
);
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->contentHeading(getMLText("default_keywords"));
$this->contentContainerStart();
?>
@ -198,12 +198,12 @@ $(document).ready( function() {
else
foreach ($lists as $list) {
?>
<form class="form-inline form" style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php">
<form class="form-inline form mb-3" style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php">
<?php echo createHiddenFieldWithKey('editkeywords'); ?>
<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="editkeywords">
<input name="keywords" class="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
<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>
<!-- <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
</form>
@ -224,8 +224,8 @@ $(document).ready( function() {
<?php echo createHiddenFieldWithKey('newkeywords'); ?>
<input type="Hidden" name="action" value="newkeywords">
<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
<input type="text" class="keywords" name="keywords">
<input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
<input type="text" class="keywords form-control" name="keywords">
<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("new_default_keywords");?></button>
</form>
</div>
</div>