cief/IZYIM-Prototype
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/IZYIM-Prototype.git synced 2026-08-19 04:33:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/ciefworldwide/IZYIM

Browse Source
This commit is contained in:
Syed Amir
2017-10-02 16:02:13 +08:00
parent 7b6c8ee434 06cbdc789d
commit 3c3d2413fb
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/Forwarder/chat.html
+1 -1
View File
@@ -442,7 +442,7 @@
<div class="actions">
<a class="btn btn-circle btn-default" style="margin-left: 15px;" data-toggle="modal" href="#chat">
<i class="fa fa-plus"></i> Add Group </a>
<a href="javascript:window.open('trackorder2.html', 'Track Order', 'width=1000,height=600');" class="btn btn-circle btn-default tooltips" data-placement="bottom" data-original-title="Track Order">
<a href="javascript:window.open('trackorder.html', 'Track Order', 'width=1000,height=600');" class="btn btn-circle btn-default tooltips" data-placement="bottom" data-original-title="Track Order">
<i class="fa fa-map-marker" aria-hidden="true"></i> Track Order
</a>
<a class="btn btn-circle btn-icon-only btn-default fullscreen" href="javascript:;" data-original-title="" title=""> </a>
public/Importer/chat.html
+1 -1
View File
@@ -386,7 +386,7 @@
<div class="actions">
<a class="btn btn-circle btn-default" style="margin-left: 15px;" data-toggle="modal" href="#chat">
<i class="fa fa-plus"></i> Add Group </a>
<a href="javascript:window.open('trackorder2.html', 'Track Order', 'width=1000,height=600');" class="btn btn-circle btn-default tooltips" data-placement="bottom" data-original-title="Track Order">
<a href="javascript:window.open('trackorder.html', 'Track Order', 'width=1000,height=600');" class="btn btn-circle btn-default tooltips" data-placement="bottom" data-original-title="Track Order">
<i class="fa fa-map-marker" aria-hidden="true"></i> Track Order
</a>
<a class="btn btn-circle btn-icon-only btn-default fullscreen" href="javascript:;" data-original-title="" title=""> </a>
public/Importer/purchaseorder2.html
-6
View File
@@ -170,12 +170,6 @@
<span class="title">Shipping Order</span>
</a>
</li>
<li class="nav-item ">
<a href="opendraft.html" class="nav-link ">
<i class="icon-envelope"></i>
<span class="title">Open Draft</span>
</a>
</li>
</ul>
</li>
<li class="nav-item">
public/Importer/shippingorder.html
+2 -2
View File
@@ -455,7 +455,7 @@ License: You must have a valid license purchased only from themeforest(the above
<th>CMB</th>
<th>Weight</th>
<th>Photo</th>
<th>Remark</th>
<th contenteditable="true">Remark</th>
</thead>
<tbody>
@@ -1324,7 +1324,7 @@ License: You must have a valid license purchased only from themeforest(the above
function addNewColumn() {
$('#table1 thead').find('tr').each(function() {
$(this).find('th').eq(7).after('<th>Remark</th>');
$(this).find('th').eq(7).after('<th contenteditable="true">Remark</th>');
});
$('#table1 tbody').find('tr').each(function() {
$(this).find('td').eq(7).after('<td><textarea style="width: 34px;"></textarea></td>');