Skip to content

Commit

Permalink
changing the bootstrap to bootstrap 3 rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielkerr
danielkerr committed Aug 13, 2013
1 parent 2ecca86 commit 5425360
Show file tree
Hide file tree
Showing 32 changed files with 454 additions and 435 deletions.
4 changes: 2 additions & 2 deletions upload/admin/view/template/catalog/category_form.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
<div class="form-group">
<label class="col-lg-3 control-label" for="input-meta-description<?php echo $language['language_id']; ?>"><?php echo $entry_meta_description; ?></label>
<div class="col-lg-9">
<textarea name="category_description[<?php echo $language['language_id']; ?>][meta_description]" cols="40" rows="5" placeholder="<?php echo $entry_meta_description; ?>" id="input-meta-description<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($category_description[$language['language_id']]) ? $category_description[$language['language_id']]['meta_description'] : ''; ?></textarea>
<textarea name="category_description[<?php echo $language['language_id']; ?>][meta_description]" rows="5" placeholder="<?php echo $entry_meta_description; ?>" id="input-meta-description<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($category_description[$language['language_id']]) ? $category_description[$language['language_id']]['meta_description'] : ''; ?></textarea>
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label" for="input-meta-keyword<?php echo $language['language_id']; ?>"><?php echo $entry_meta_keyword; ?></label>
<div class="col-lg-9">
<textarea name="category_description[<?php echo $language['language_id']; ?>][meta_keyword]" cols="40" rows="5" placeholder="<?php echo $entry_meta_keyword; ?>" id="input-meta-keyword<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($category_description[$language['language_id']]) ? $category_description[$language['language_id']]['meta_keyword'] : ''; ?></textarea>
<textarea name="category_description[<?php echo $language['language_id']; ?>][meta_keyword]" rows="5" placeholder="<?php echo $entry_meta_keyword; ?>" id="input-meta-keyword<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($category_description[$language['language_id']]) ? $category_description[$language['language_id']]['meta_keyword'] : ''; ?></textarea>
</div>
</div>
<div class="form-group">
Expand Down
8 changes: 3 additions & 5 deletions upload/admin/view/template/catalog/category_list.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
</div>
<?php } ?>
<div class="panel">
<div class="panel-heading">
<h1 class="panel-title"><i class="icon-list"></i> <?php echo $heading_title; ?></h1>
<div class="panel-heading"><a href="<?php echo $insert; ?>" class="btn btn-primary"><i class="icon-plus"></i> <?php echo $button_insert; ?></a> <a href="<?php echo $repair; ?>" class="btn btn-default"><i class="icon-wrench"></i> <?php echo $button_repair; ?></a>
<button type="submit" form="form-category" class="btn btn-default"><i class="icon-trash"></i> <?php echo $button_delete; ?></button>
<h1><i class="icon-list"></i> <?php echo $heading_title; ?></h1>
</div>
<form action="<?php echo $delete; ?>" method="post" enctype="multipart/form-data" id="form-category">
<table class="table table-striped table-bordered table-hover">
Expand Down Expand Up @@ -57,9 +58,6 @@
<div class="col-lg-6 text-left"><?php echo $pagination; ?></div>
<div class="col-lg-6 text-right"><?php echo $results; ?></div>
</div>
<div class="panel-footer"><a href="<?php echo $insert; ?>" class="btn btn-primary"><i class="icon-plus"></i> <?php echo $button_insert; ?></a> <a href="<?php echo $repair; ?>" class="btn btn-default"><i class="icon-wrench"></i> <?php echo $button_repair; ?></a>
<button type="submit" form="form-category" class="btn btn-default"><i class="icon-trash"></i> <?php echo $button_delete; ?></button>
</div>
</div>
</div>
<?php echo $footer; ?>
12 changes: 6 additions & 6 deletions upload/admin/view/template/catalog/product_form.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,8 @@
<input type="hidden" name="product_attribute[<?php echo $attribute_row; ?>][attribute_id]" value="<?php echo $product_attribute['attribute_id']; ?>" /></td>
<td class="text-left"><?php foreach ($languages as $language) { ?>
<div class="input-group">
<textarea name="product_attribute[<?php echo $attribute_row; ?>][product_attribute_description][<?php echo $language['language_id']; ?>][text]" rows="5" placeholder="<?php echo $entry_text; ?>" class="form-control"><?php echo isset($product_attribute['product_attribute_description'][$language['language_id']]) ? $product_attribute['product_attribute_description'][$language['language_id']]['text'] : ''; ?></textarea>
<span class="input-group-addon"><img src="view/image/flags/<?php echo $language['image']; ?>" title="<?php echo $language['name']; ?>" /></span>
<textarea name="product_attribute[<?php echo $attribute_row; ?>][product_attribute_description][<?php echo $language['language_id']; ?>][text]" rows="5" placeholder="<?php echo $entry_text; ?>" class="form-control"><?php echo isset($product_attribute['product_attribute_description'][$language['language_id']]) ? $product_attribute['product_attribute_description'][$language['language_id']]['text'] : ''; ?></textarea>
</div>
<?php } ?></td>
<td class="text-left"><button type="button" onclick="$('#attribute-row<?php echo $attribute_row; ?>').remove();" class="btn btn-danger"><i class="icon-minus-sign"></i> <?php echo $button_remove; ?></button></td>
Expand Down Expand Up @@ -486,7 +486,7 @@
<div class="form-group">
<label class="col-lg-3 control-label" for="input-value<?php echo $option_row; ?>"><?php echo $entry_option_value; ?></label>
<div class="col-lg-9">
<textarea name="product_option[<?php echo $option_row; ?>][value]" cols="40" rows="5" placeholder="<?php echo $entry_option_value; ?>" id="input-value<?php echo $option_row; ?>" class="form-control"><?php echo $product_option['value']; ?></textarea>
<textarea name="product_option[<?php echo $option_row; ?>][value]" rows="5" placeholder="<?php echo $entry_option_value; ?>" id="input-value<?php echo $option_row; ?>" class="form-control"><?php echo $product_option['value']; ?></textarea>
</div>
</div>
<?php } ?>
Expand Down Expand Up @@ -976,13 +976,13 @@ var attribute_row = <?php echo $attribute_row; ?>;
function addAttribute() {
html = '<tr id="attribute-row' + attribute_row + '">';
html += ' <td class="text-left"><input type="text" name="product_attribute[' + attribute_row + '][name]" value="" placeholder="<?php echo $entry_attribute; ?>" /><input type="hidden" name="product_attribute[' + attribute_row + '][attribute_id]" value="" /></td>';
html += ' <td class="text-left"><input type="text" name="product_attribute[' + attribute_row + '][name]" value="" placeholder="<?php echo $entry_attribute; ?>" class="form-control" /><input type="hidden" name="product_attribute[' + attribute_row + '][attribute_id]" value="" /></td>';
html += ' <td class="text-left">';
<?php foreach ($languages as $language) { ?>
html += '<textarea name="product_attribute[' + attribute_row + '][product_attribute_description][<?php echo $language['language_id']; ?>][text]" cols="40" rows="5" placeholder="<?php echo $entry_text; ?>"></textarea> <img src="view/image/flags/<?php echo $language['image']; ?>" title="<?php echo $language['name']; ?>" /><br />';
html += '<div class="input-group"><span class="input-group-addon"><img src="view/image/flags/<?php echo $language['image']; ?>" title="<?php echo $language['name']; ?>" /></span><textarea name="product_attribute[' + attribute_row + '][product_attribute_description][<?php echo $language['language_id']; ?>][text]" rows="5" placeholder="<?php echo $entry_text; ?>" class="form-control"></textarea></div>';
<?php } ?>
html += ' </td>';
html += ' <td class="text-left"><a onclick="$(\'#attribute-row' + attribute_row + '\').remove();" class="btn"><i class="icon-minus-sign"></i> <?php echo $button_remove; ?></a></td>';
html += ' <td class="text-left"><button type="button" onclick="$(\'#attribute-row' + attribute_row + '\').remove();" class="btn btn-danger"><i class="icon-minus-sign"></i> <?php echo $button_remove; ?></button></td>';
html += '</tr>';
$('#attribute tbody').append(html);
Expand Down Expand Up @@ -1066,7 +1066,7 @@ $('input[name=\'option\']').autocomplete({
if (item['type'] == 'textarea') {
html += ' <div class="form-group">';
html += ' <label class="col-lg-3 control-label" for="input-value' + option_row + '"><?php echo $entry_option_value; ?></label>';
html += ' <div class="col-lg-9"><textarea name="product_option[' + option_row + '][value]" cols="40" rows="5" placeholder="<?php echo $entry_option_value; ?>" id="input-value' + option_row + '" class="form-control"></textarea></div>';
html += ' <div class="col-lg-9"><textarea name="product_option[' + option_row + '][value]" rows="5" placeholder="<?php echo $entry_option_value; ?>" id="input-value' + option_row + '" class="form-control"></textarea></div>';
html += ' </div>';
}
Expand Down
42 changes: 17 additions & 25 deletions upload/admin/view/template/common/dashboard.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,39 +13,31 @@
<div class="col-lg-6">
<div class="row">
<div class="col-6">
<div class="stats">
<div><span class="badge badge-success"><i class="icon-usd"></i></span></div>
<div><span><?php echo $sale_growth; ?> </span> <?php echo $sale_total; ?></div>
</div>
<div><span class="badge badge-success"><i class="icon-usd"></i></span></div>
<div><span><?php echo $sale_growth; ?> </span> <?php echo $sale_total; ?></div>
</div>
<div class="col-6">
<div class="stats">
<div><i class="icon-shopping-cart"></i></div>
<div>
<h5><?php echo $text_orders; ?></h5>
<?php echo $order_total; ?><br />
<span><?php echo $order_growth; ?>%</span></div>
</div>
<div><i class="icon-shopping-cart"></i></div>
<div>
<h5><?php echo $text_orders; ?></h5>
<?php echo $order_total; ?><br />
<span><?php echo $order_growth; ?>%</span></div>
</div>
</div>
<div class="row">
<div class="col-6">
<div class="stats">
<div><i class="icon-user"></i></div>
<div>
<h5><?php echo $text_customers; ?></h5>
<?php echo $customer_total; ?><br />
<span><?php echo $customer_growth; ?>%</span></div>
</div>
<div><i class="icon-user"></i></div>
<div>
<h5><?php echo $text_customers; ?></h5>
<?php echo $customer_total; ?><br />
<span><?php echo $customer_growth; ?>%</span></div>
</div>
<div class="col-6">
<div class="stats">
<div><i class="icon-globe"></i></div>
<div>
<h5><?php echo $text_marketing; ?></h5>
Clicks: <?php echo $marketing_total; ?> / Orders: 1<br />
<span>+10%</span></div>
</div>
<div><i class="icon-globe"></i></div>
<div>
<h5><?php echo $text_marketing; ?></h5>
Clicks: <?php echo $marketing_total; ?> / Orders: 1<br />
<span>+10%</span></div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/extension/modification_form.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<div class="form-group">
<label class="col-lg-3 control-label" for="input-code"><?php echo $entry_code; ?></label>
<div class="col-lg-9">
<textarea name="code" cols="40" rows="15" id="input-code" class="form-control"><?php echo $code; ?></textarea>
<textarea name="code" rows="15" id="input-code" class="form-control"><?php echo $code; ?></textarea>
</div>
</div>
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/feed/google_base.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="form-group">
<label class="col-lg-3 control-label" for="input-data-feed"><?php echo $entry_data_feed; ?></label>
<div class="col-lg-9">
<textarea cols="40" rows="5" readonly="readonly" id="input-data-feed" class="form-control"><?php echo $data_feed; ?></textarea>
<textarea rows="5" readonly="readonly" id="input-data-feed" class="form-control"><?php echo $data_feed; ?></textarea>
</div>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/feed/google_sitemap.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="form-group">
<label class="col-lg-3 control-label" for="input-data-feed"><?php echo $entry_data_feed; ?></label>
<div class="col-lg-9">
<textarea cols="40" rows="5" readonly="readonly" id="input-data-feed" class="form-control"><?php echo $data_feed; ?></textarea>
<textarea rows="5" readonly="readonly" id="input-data-feed" class="form-control"><?php echo $data_feed; ?></textarea>
</div>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/localisation/country_form.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<div class="form-group">
<label class="col-lg-3 control-label" for="input-address-format"><?php echo $entry_address_format; ?> </label>
<div class="col-lg-9">
<textarea name="address_format" cols="40" rows="5" placeholder="<?php echo $entry_address_format; ?>" id="input-address-format" class="form-control"><?php echo $address_format; ?></textarea>
<textarea name="address_format" rows="5" placeholder="<?php echo $entry_address_format; ?>" id="input-address-format" class="form-control"><?php echo $address_format; ?></textarea>
<span class="help-block"><?php echo $help_address_format; ?></span> </div>
</div>
<div class="form-group">
Expand Down
4 changes: 2 additions & 2 deletions upload/admin/view/template/localisation/location_form.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@
<div class="form-group">
<label class="col-lg-3 control-label" for="input-open"><?php echo $entry_open; ?></label>
<div class="col-lg-9">
<textarea name="open" cols="40" rows="5" placeholder="<?php echo $entry_open; ?>" id="input-open" class="form-control"><?php echo $open; ?></textarea>
<textarea name="open" rows="5" placeholder="<?php echo $entry_open; ?>" id="input-open" class="form-control"><?php echo $open; ?></textarea>
<span class="help-block"><?php echo $help_open; ?></span> </div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label" for="input-comment"><?php echo $entry_comment; ?></label>
<div class="col-lg-9">
<textarea name="comment" cols="40" rows="5" placeholder="<?php echo $entry_comment; ?>" id="input-comment" class="form-control"><?php echo $comment; ?></textarea>
<textarea name="comment" rows="5" placeholder="<?php echo $entry_comment; ?>" id="input-comment" class="form-control"><?php echo $comment; ?></textarea>
<span class="help-block"><?php echo $help_comment; ?></span> </div>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/marketing/marketing_form.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="form-group">
<label class="col-lg-3 control-label" for="input-description"><?php echo $entry_description; ?></label>
<div class="col-lg-9">
<textarea name="description" cols="40" rows="5" placeholder="<?php echo $entry_description; ?>" id="input-description" class="form-control"><?php echo $description; ?></textarea>
<textarea name="description" rows="5" placeholder="<?php echo $entry_description; ?>" id="input-description" class="form-control"><?php echo $description; ?></textarea>
</div>
</div>
<div class="form-group required">
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/module/google_talk.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="form-group required">
<label class="col-lg-3 control-label" for="input-code"><?php echo $entry_code; ?></label>
<div class="col-lg-9">
<textarea name="google_talk_code" cols="40" rows="5" id="input-code" class="form-control"><?php echo $google_talk_code; ?></textarea>
<textarea name="google_talk_code" rows="5" id="input-code" class="form-control"><?php echo $google_talk_code; ?></textarea>
<span class="help-block"><?php echo $help_code; ?></span>
<?php if ($error_code) { ?>
<span class="text-error"><?php echo $error_code; ?></span>
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/payment/authorizenet_sim.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<div class="form-group">
<label class="col-lg-3 control-label" for="input-callback"><?php echo $entry_callback; ?></label>
<div class="col-lg-9">
<textarea cols="40" rows="5" readonly="readonly" id="input-callback" class="form-control"><?php echo $callback; ?></textarea>
<textarea rows="5" readonly="readonly" id="input-callback" class="form-control"><?php echo $callback; ?></textarea>
</div>
</div>
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/payment/payza.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<div class="form-group">
<label class="col-lg-3 control-label" for="input-callback"><?php echo $entry_callback; ?></label>
<div class="col-lg-9">
<textarea cols="40" rows="5" readonly="readonly" id="input-callback" class="form-control"><?php echo $callback; ?></textarea>
<textarea rows="5" readonly="readonly" id="input-callback" class="form-control"><?php echo $callback; ?></textarea>
<span class="help-block"><?php echo $help_callback; ?></span> </div>
</div>
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/payment/worldpay.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<div class="form-group">
<label class="col-lg-3 control-label" for="input-callback"><?php echo $entry_callback; ?></label>
<div class="col-lg-9">
<textarea cols="40" rows="5" readonly="readonly" id="input-callback" class="form-control"><?php echo $callback; ?></textarea>
<textarea rows="5" readonly="readonly" id="input-callback" class="form-control"><?php echo $callback; ?></textarea>
<span class="help-block"><?php echo $help_callback; ?></span> </div>
</div>
<div class="form-group">
Expand Down
38 changes: 21 additions & 17 deletions upload/admin/view/template/report/affiliate.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,29 @@
<div class="panel-heading">
<h1 class="panel-title"><i class="icon-bar-chart"></i> <?php echo $heading_title; ?></h1>
</div>
<div class="well">
<div class="row">
<div class="col-lg-2">
<label for="input-date-start"><?php echo $entry_date_start; ?></label>
</div>
<div class="col-lg-3">
<input type="date" name="filter_date_start" value="<?php echo $filter_date_start; ?>" id="input-date-start" class="form-control" />
</div>
<div class="col-lg-2">
<label class="control-label" for="input-date-end"><?php echo $entry_date_end; ?></label>
</div>
<div class="col-lg-3">
<input type="date" name="filter_date_end" value="<?php echo $filter_date_end; ?>" id="input-date-end" class="form-control" />
</div>
<div class="col-lg-2">
<button type="button" id="button-filter" class="btn btn-default"><i class="icon-search"></i> <?php echo $button_filter; ?></button>
<form class="form-horizontal">
<div class="well">
<div class="row">
<div class="col-lg-10">
<div class="form-group">
<label class="col-lg-3 control-label" for="input-date-start"><?php echo $entry_date_start; ?></label>
<div class="col-lg-9">
<input type="date" name="filter_date_start" value="<?php echo $filter_date_start; ?>" id="input-date-start" class="form-control" />
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label" for="input-date-end"><?php echo $entry_date_end; ?></label>
<div class="col-lg-9">
<input type="date" name="filter_date_end" value="<?php echo $filter_date_end; ?>" id="input-date-end" class="form-control" />
</div>
</div>
</div>
<div class="col-lg-2">
<button type="button" id="button-filter" class="btn btn-default pull-right"><i class="icon-search"></i> <?php echo $button_filter; ?></button>
</div>
</div>
</div>
</div>
</form>
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
Expand Down
Loading

0 comments on commit 5425360

Please sign in to comment.