TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working

Browse Source 
- Add Jqueryui theme
- Change values in edit page
- Add filter on list page
This commit is contained in:
mespeche
2013-09-03 10:45:06 +02:00
parent 71d557020f
commit 42175ca4eb
20 changed files with 1264 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
templates/admin/default/assets/css/admin.less
View File

@@ -981,4 +981,42 @@ th.tablesorter-headerAsc {
th.tablesorter-headerDesc {
background: #F9F9F9 url("data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7") no-repeat center right;
}
.tablesorter{
.disabled{
display: none;
}
}
.tablesorter .value-popup:after {
content : attr(data-value);
position: absolute;
bottom: 14px;
left: -7px;
min-width: 18px;
.rounded(4px);
#gradient > .vertical(rgb(243,153,34), rgb(227,83,11));
box-shadow: inset 0px 0px 2px rgba(250,250,250,0.5), 0px 1px 3px rgba(0,0,0,0.2);
color: white;
font-size: 11px;
padding: 2px 5px;
text-align: center;
}
.tablesorter .value-popup:before {
content: "";
position: absolute;
width: 0;
height: 0;
border-top: 8px solid #777;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
top: -8px;
left: 50%;
margin-left: -8px;
margin-top: -1px;
}
.ui-slider{
margin-top: 23px;
}

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/animated-overlay.gif Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 212 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_flat_75_F9F9F9_40x100.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 230 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 335 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_glass_95_fef1ec_1x400.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 332 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-hard_75_FFF_1x100.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 203 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_100_f39922_1x100.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 364 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_65_f39922_1x100.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 349 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-bg_highlight-soft_75_f39922_1x100.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 366 B

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_2e83ff_256x240.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_333333_256x240.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_454545_256x240.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_888888_256x240.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_FFF_256x240.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
templates/admin/default/assets/css/jqueryui/custom-theme/images/ui-icons_cd0a0a_256x240.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

1177
templates/admin/default/assets/css/jqueryui/custom-theme/jquery-ui-1.10.3.custom.css vendored Executable file
View File

File diff suppressed because it is too large Load Diff

21
templates/admin/default/assets/js/main.js
View File

@@ -15,18 +15,25 @@
widgetOptions : {
filter_cssFilter : 'input-medium',
filter_formatter : {
2 : function($cell, indx){
return $.tablesorter.filterFormatter.uiDateCompare( $cell, indx, {
dateFormat: "dd/mm/yy",
changeMonth : true,
changeYear : true,
compare : '='
});
},
3 : function($cell, indx){
return $.tablesorter.filterFormatter.uiSlider( $cell, indx, {
animate : true,
return $.tablesorter.filterFormatter.uiRange( $cell, indx, {
value: 1,
min: 1,
max: 50,
delayed: true,
valueToHeader: true,
exactMatch: false,
allText: 'all',
compare: '>='
});
valueToHeader: false,
exactMatch: false
});
}
}
}

51
templates/admin/default/coupon/edit.html
View File

@@ -69,7 +69,7 @@
</div>
</div>
<div class="span8">
<div class="span8 well">
<div class="span6">
<div class="control-group">
<label for="effect">Effect :</label>
@@ -107,7 +107,7 @@
<div class="control-group">
<label for="long-description">Long description :</label>
<textarea id="long-description" name="long-description" placeholder="long description" class="span12" rows="10"></textarea>
<textarea id="long-description" name="long-description" placeholder="long description" class="span12 wysiwyg" rows="10"></textarea>
</div>
<button type="submit" class="btn btn-primary">Save</button>
@@ -135,17 +135,17 @@
<tbody>
<tr>
<td>Total Amount</td>
<td>>=</td>
<td>300</td>
<td><span class="label">is superior or equals to</span></td>
<td>300 &euro;</td>
<td>
<a href="#url" class="btn btn-primary btn-medium"><span class="icon-edit icon-white"></span> Edit</a>
<a href="#url" class="btn btn-danger btn-medium" data-toggle="confirm" data-target="#delete"><span class="icon-remove icon-white"></span> Delete</a>
</td>
</tr>
<tr>
<td><span class="label label-info">AND</span> NbArticleFromCategory</td>
<td>=</td>
<td>12 - Chaussettes rouges</td>
<td><span class="label">AND</span> NbArticleFromCategory</td>
<td><span class="label">is equals to</span></td>
<td>12 - <a href="#" target="_blank">Chaussettes rouges</a></td>
<td>
<a href="#url" class="btn btn-primary btn-medium"><span class="icon-edit icon-white"></span> Edit</a>
<a href="#url" class="btn btn-danger btn-medium" data-toggle="confirm" data-target="#delete"><span class="icon-remove icon-white"></span> Delete</a>
@@ -153,7 +153,7 @@
</tr>
<tr>
<td><span class="label label-info">OR</span> Date</td>
<td><=</td>
<td><span class="label">is inferior or equals to</span></td>
<td>12/02/2014</td>
<td>
<a href="#url" class="btn btn-primary btn-medium"><span class="icon-edit icon-white"></span> Edit</a>
@@ -167,7 +167,7 @@
<section class="row-fluid">
<div class="span12 general-block-decorator">
<div class="control-group span2">
<label for="type">Condition type :</label>
<label class="radio">
@@ -205,13 +205,14 @@
<label for="operator">Operator :</label>
<div class="controls">
<select name="operator" id="operator">
<option value="1">></option>
<option value="2">=</option>
<option value="3"><</option>
<option value="4"><=</option>
<option value="5">>=</option>
<option value="1">is superior to</option>
<option value="2">equals to</option>
<option value="3">is inferior to</option>
<option value="4">is inferior or equals to</option>
<option value="5">is superior or equals to</option>
</select>
<div class="input-append">
<div class="input-append input-prepend">
<span class="add-on">&euro;</span>
<input type="text" name="value" class="input-mini">
<button class="add-on btn btn-primary"><span class="icon-plus icon-white"></span></button>
</div>
@@ -220,11 +221,11 @@
<label for="operator">Operator :</label>
<div class="controls">
<select name="operator" id="operator">
<option value="1">></option>
<option value="2" selected>=</option>
<option value="3"><</option>
<option value="4"><=</option>
<option value="5">>=</option>
<option value="1">is superior to</option>
<option value="2">equals to</option>
<option value="3">is inferior to</option>
<option value="4">is inferior or equals to</option>
<option value="5">is superior or equals to</option>
</select>
<div class="input-append input-prepend date" data-date="12/02/2012" data-date-format="dd/mm/yyyy">
<span class="add-on"><span class="icon-th"></span></span>
@@ -236,11 +237,11 @@
<label for="operator">Operator :</label>
<div class="controls">
<select name="operator" id="operator">
<option value="1">></option>
<option value="2" selected>=</option>
<option value="3"><</option>
<option value="4"><=</option>
<option value="5">>=</option>
<option value="1">is superior to</option>
<option value="2">equals to</option>
<option value="3">is inferior to</option>
<option value="4">is inferior or equals to</option>
<option value="5">is superior or equals to</option>
</select>
<input type="text" name="value" class="input-mini">

14
templates/admin/default/coupon/list.html
View File

@@ -36,7 +36,7 @@
</thead>
<tbody>
<tr>
<td>XMAS13</td>
<td><a href="#">XMAS13</a></td>
<td>Coupon for XMAS -30 &euro;</td>
<td>18/10/2013</td>
<td>49</td>
@@ -46,7 +46,7 @@
</td>
</tr>
<tr>
<td>XMAS14</td>
<td><a href="#">XMAS13</a></td>
<td>Coupon for XMAS -30 &euro;</td>
<td>05/09/2013</td>
<td>20</td>
@@ -56,7 +56,7 @@
</td>
</tr>
<tr>
<td>XMAS15</td>
<td><a href="#">XMAS13</a></td>
<td>Coupon for XMAS -30 &euro;</td>
<td>03/12/2013</td>
<td>9</td>
@@ -66,7 +66,7 @@
</td>
</tr>
<tr>
<td>XMAS16</td>
<td><a href="#">XMAS13</a></td>
<td>Coupon for XMAS -30 &euro;</td>
<td>25/01/2013</td>
<td>4</td>
@@ -172,8 +172,12 @@
{include file='includes/js.inc.html'}
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.0/themes/cupertino/jquery-ui.css">
{stylesheets file='../assets/css/jqueryui/custom-theme/*' filters='less,cssembed'}
<link rel="stylesheet" href="{$asset_url}">
{/stylesheets}
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.0/jquery-ui.min.js"></script>
{javascripts file='../assets/bootstrap-editable/js/bootstrap-editable.js'}
<script src="{$asset_url}"></script>
{/javascripts}