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

public/templates/bootstrap/admin/news/default.tpl

@@ -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="panel-footer">
-              <div class="submit_link">
+                <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="icon-wrench"></i></a>&nbsp;
+                  <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="icon-trash"></i></a>
+                  <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}

public/templates/bootstrap/admin/news_edit/default.tpl

@@ -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}">
+<div class="row">
-  <input type="hidden" name="page" value="{$smarty.request.page|escape}">
+  <div class="col-lg-12">
-  <input type="hidden" name="action" value="{$smarty.request.action|escape}">
+    <div class="panel panel-info">
-  <input type="hidden" name="id" value="{$NEWS.id}">
+      <div class="panel-heading">
-  <input type="hidden" name="do" value="save">
+        <i class="fa fa-edit fa-fw"></i> Edit news entry #{$NEWS.id}
-  <table class="tablesorter" cellspacing="0">
+      </div>
-    <tr>
+      <div class="panel-body">
-      <th>Active</th>
+        <div class="row">
-      <td>
+          <div class="col-lg-12">
-        <input type="hidden" name="active" value="0" />
+            <form method="POST" action="{$smarty.server.SCRIPT_NAME}" role="form">
-        <input type="checkbox" name="active" value="1" id="active" {nocache}{if $NEWS.active}checked{/if}{/nocache} />
+              <input type="hidden" name="page" value="{$smarty.request.page|escape}">
-        <label for="active"></label>
+              <input type="hidden" name="action" value="{$smarty.request.action|escape}">
-      </td>
+              <input type="hidden" name="id" value="{$NEWS.id}">
-    </tr>
+              <input type="hidden" name="do" value="save">
-    <tr>
+              
-      <th>Header</th>
+              <div class="form-group">
-      <td><input name="header" type="text" size="30" value="{nocache}{$NEWS.header}{/nocache}" required /></td>
+                <th>Active</th>
-    </tr>
+                <td>
-    <tr>
+                  <input type="hidden" name="active" value="0" />
-      <th>Content</th>
+                  <input type="checkbox" name="active" value="1" id="active" {nocache}{if $NEWS.active}checked{/if}{/nocache} />
-      <td><textarea class="cleditor" name="content" rows="15" cols="150" type="text" required>{nocache}{$NEWS.content nofilter}{/nocache}</textarea></td>
+                  <label for="active"></label>
-    </tr>
+                </td>
-  </table>
+              </div>
-   <footer>
+              <div class="form-group">
-    <div class="submit_link">
+                  <th>Header</th>
-      <input type="submit" value="Save" class="alt_btn">
+                  <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> 
+  </div>
-</form>
+</div>
-</article>