Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap

This commit is contained in:
Sebastian Grewe 2014-03-01 18:19:45 +01:00
commit dcc008e7d7
2 changed files with 47 additions and 38 deletions

View File

@ -14,7 +14,7 @@
<div class="panel-body">
<div class="row">
<div class="col-lg-12">
<form method="POST" action="{$smarty.server.SCRIPT_NAME}">
<form method="POST" action="{$smarty.server.SCRIPT_NAME}" role="form">
<input type="hidden" name="page" value="{$smarty.request.page|escape}">
<input type="hidden" name="action" value="{$smarty.request.action|escape}">
<input type="hidden" name="do" value="add">
@ -47,7 +47,7 @@
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-info fa-fw"></i> <a data-toggle="collapse" data-parent="#accordion" href="#collapse{$smarty.section.news.index}">{$NEWS[news].header}</a>
<i class="fa fa-info fa-fw"></i> {$NEWS[news].header}</a>
<br />
<font size="1px">posted {$NEWS[news].time|date_format:"%b %e, %Y at %H:%M"}{if $HIDEAUTHOR|default:"0" == 0} by <b>{$NEWS[news].author}</b>{/if}</font>
</div>
@ -55,12 +55,12 @@
<div class="panel-body">
{$NEWS[news].content nofilter}
</div>
<footer>
<div class="submit_link">
<a href='{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action=news_edit&id={$NEWS[news].id}'><i class="icon-wrench"></i></a>&nbsp;
<a href='{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&do=delete&id={$NEWS[news].id}'><i class="icon-trash"></i></a>
<div class="panel-footer">
<div style="text-align:right">
<a href='{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action=news_edit&id={$NEWS[news].id}'><i class="fa fa-wrench fa-fw"></i></a>&nbsp;
<a href='{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&do=delete&id={$NEWS[news].id}'><i class="fw fa-trash-o fa-fw"></i></a>
</div>
</div>
</footer>
</div>
</div>
{/section}

View File

@ -3,35 +3,44 @@
<script type="text/javascript">
$(document).ready(function () { $(".cleditor").cleditor(); });
</script>
<article class="module width_full">
<header><h3>Edit news entry #{$NEWS.id}</h3></header>
<form method="POST" action="{$smarty.server.SCRIPT_NAME}">
<input type="hidden" name="page" value="{$smarty.request.page|escape}">
<input type="hidden" name="action" value="{$smarty.request.action|escape}">
<input type="hidden" name="id" value="{$NEWS.id}">
<input type="hidden" name="do" value="save">
<table class="tablesorter" cellspacing="0">
<tr>
<th>Active</th>
<td>
<input type="hidden" name="active" value="0" />
<input type="checkbox" name="active" value="1" id="active" {nocache}{if $NEWS.active}checked{/if}{/nocache} />
<label for="active"></label>
</td>
</tr>
<tr>
<th>Header</th>
<td><input name="header" type="text" size="30" value="{nocache}{$NEWS.header}{/nocache}" required /></td>
</tr>
<tr>
<th>Content</th>
<td><textarea class="cleditor" name="content" rows="15" cols="150" type="text" required>{nocache}{$NEWS.content nofilter}{/nocache}</textarea></td>
</tr>
</table>
<footer>
<div class="submit_link">
<input type="submit" value="Save" class="alt_btn">
<div class="row">
<div class="col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-edit fa-fw"></i> Edit news entry #{$NEWS.id}
</div>
<div class="panel-body">
<div class="row">
<div class="col-lg-12">
<form method="POST" action="{$smarty.server.SCRIPT_NAME}" role="form">
<input type="hidden" name="page" value="{$smarty.request.page|escape}">
<input type="hidden" name="action" value="{$smarty.request.action|escape}">
<input type="hidden" name="id" value="{$NEWS.id}">
<input type="hidden" name="do" value="save">
<div class="form-group">
<th>Active</th>
<td>
<input type="hidden" name="active" value="0" />
<input type="checkbox" name="active" value="1" id="active" {nocache}{if $NEWS.active}checked{/if}{/nocache} />
<label for="active"></label>
</td>
</div>
<div class="form-group">
<th>Header</th>
<td><input class="form-control" name="header" type="text" size="30" value="{nocache}{$NEWS.header}{/nocache}" required /></td>
</div>
<div class="form-group">
<th>Content</th>
<td><textarea class="cleditor form-control" name="content" rows="15" cols="150" type="text" required>{nocache}{$NEWS.content nofilter}{/nocache}</textarea></td>
</div>
<input type="submit" value="Save" class="btn btn-outline btn-success btn-lg btn-block">
</form>
</div>
</div>
</div>
</div>
</footer>
</form>
</article>
</div>
</div>