take out submit from contentContainer, add class btn-primary to buttons

This commit is contained in:
Uwe Steinmann 2021-05-01 14:50:04 +02:00
parent feee7732ca
commit 262ba1345b
3 changed files with 10 additions and 10 deletions

View File

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

View File

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

View File

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