Product loop adjustements

This commit is contained in:
franck
2013-08-01 10:53:35 +02:00
parent c6366c69bd
commit 4ad94059e7
24 changed files with 348 additions and 107 deletions

View File

@@ -1,14 +1,11 @@
{$page_title={intl l='Thelia'}}
{$page_title={intl l='Page not found'}}
{include file='includes/header.inc.html'}
<div class="brandbar container">
<a class="brand" href="index.php">{images file='assets/img/logo-thelia-34px.png'}<img src="{$asset_url}" alt="{intl l='Thelia, solution e-commerce libre'}" />{/images}</a>
</div>
<div id="wrapper" class="container">
<h1>Oops! An Error Occurred</h1>
<h2>The server returned a "404 Not Found".</h2>
<h1>{intl l="Oops! An Error Occurred"}</h1>
<h2>{intl l='The server returned a "404 Not Found"'}</h2>
<p>{intl l='The page you\'ve requested was not found. Please check the page address, and try again.'}</p>
</div>
{include file='includes/footer.inc.html'}

View File

@@ -1,11 +1,28 @@
// -- Tools --------------------------------------------------------------------
.border-radius(@radius: 5px) {
-webkit-border-radius: @radius;
-moz-border-radius: @radius;
border-radius: @radius;
.rounded(@radius: 2px) {
-webkit-border-radius: @radius;
-moz-border-radius: @radius;
border-radius: @radius;
}
.border-radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) {
-webkit-border-top-right-radius: @topright;
-webkit-border-bottom-right-radius: @bottomright;
-webkit-border-bottom-left-radius: @bottomleft;
-webkit-border-top-left-radius: @topleft;
-moz-border-radius-topright: @topright;
-moz-border-radius-bottomright: @bottomright;
-moz-border-radius-bottomleft: @bottomleft;
-moz-border-radius-topleft: @topleft;
border-top-right-radius: @topright;
border-bottom-right-radius: @bottomright;
border-bottom-left-radius: @bottomleft;
border-top-left-radius: @topleft;
.background-clip(padding-box);
}
.box-shadow(@shadow: 0 1px 2px rgba(0,0,0,.05)) {
-webkit-box-shadow: @shadow;
-moz-box-shadow: @shadow;
@@ -130,6 +147,10 @@ hr {
float: right;
margin: 0px;
.control-group {
margin-bottom: 0px;
}
input.search-query {
background: url("img/search.png") no-repeat;
width: 212px;
@@ -137,7 +158,7 @@ hr {
outline: none;
border: none;
padding: 5px 20px 5px 20px;
border-radius: 0px;
.rounded(0px);
font-size: 12px;
color: #eee;
@@ -160,7 +181,7 @@ hr {
border: none;
top: 17px;
box-shadow: none;
border-radius: 0px;
.rounded(0px);
z-index: 1337;
}
}
@@ -196,6 +217,7 @@ hr {
// -- Brandbar ----------------------------------------------------------------
.loginpage {
.brandbar {
width: 100%;
}
@@ -231,7 +253,7 @@ hr {
}
.breadcrumb {
border-radius: 0px;
.rounded(0px);
padding: 25px 0px 25px 30px;
background: url("img/logo-light.png") left center no-repeat;
float: left;
@@ -279,6 +301,38 @@ hr {
}
}
// -- Navigation bar ----------------------------------------------------------
.navbar {
margin-bottom: 0px;
}
.navbar-inner {
border-top: none;
.border-radius(0, 4px, 4px, 0);
.container{
width: 1170px;
}
}
// -- Breadcrumb --------------------------------------------------------------
.breadcrumb {
margin-top: 0;
background-color: transparent;
padding: 0 15px;
> li > .divider {
color: inherit;
}
> .active {
color: inherit;
}
}
// -- Feed list on home page --------------------------------------------------
.feed-list {
@@ -314,10 +368,15 @@ hr {
margin: 0 auto 20px;
background-color: #fff;
border: 1px solid #e5e5e5;
.border-radius;
.rounded(5px);
.box-shadow;
}
textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="date"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus, .uneditable-input:focus {
border: 1px solid #E9730F;
box-shadow: 0px 0px 8px #FFA65A;
}
// -- Allow inline forms validation states ------------------------------------
.form-inline .warning .control-label,
@@ -474,4 +533,51 @@ hr {
color: #3a87ad;
background-color: #d9edf7;
border-color: #3a87ad;
}
// -- Catalog Tables ----------------------------------------------------------
.table-striped {
background: white;
caption {
text-align: left;
color: #5A6876;
text-transform: uppercase;
font-weight: bold;
background-color: #fff;
padding: 0.5em 0.5em 0.5em 1em;
border-bottom: 2px solid #A5CED8;
line-height: 30px;
.btn-add-item {
display: block;
float: right;
}
}
td, th {
text-align: center;
}
td.object-title, th.object-title {
text-align: left;
}
td.message {
// Center the alert box (20px bottom margin) in the table cell
padding: 20px 20px 0 20px;
// No border, nor background in alert blocks
.alert {
border: none;
background-color: transparent;
&-info {
background-color: transparent;
}
}
}
}

View File

@@ -7,7 +7,9 @@
{module_include location='home_top'}
welcome home !
<div class="span12">
This is the administration home page. Put some interesting statistics here, and display useful information :)
</div>
{module_include location='home_bottom'}
</div>

View File

@@ -1,3 +1,5 @@
{module_include location='before_footer'}
<hr />
<footer class="modal-footer">
<div class="container">
@@ -7,19 +9,12 @@
- <a href="http://contrib.thelia.net/" target="_blank">{intl l='Contributions Thelia'}</a>
<span class="pull-right">{intl l='interface par <a target="_blank" href="http://www.steaw-webdesign.com/">Steaw-Webdesign</a>'}</span>
</p>
{module_include location='in_footer'}
</div>
</footer>
{* Include required JS files *}
{javascripts file='../assets/js/jquery.min.js'}
<link rel="stylesheet" href="{$asset_url}" target="screen">
{/javascripts}
{javascripts file='../assets/bootstrap/js/bootstrap.min.js'}
<link rel="stylesheet" href="{$asset_url}" target="screen">
{/javascripts}
{* TODO allow modules to include JS here *}
{module_include location='after_footer'}
</body>
</html>

View File

@@ -19,6 +19,16 @@
<link rel="stylesheet" href="{$asset_url}">
{/stylesheets}
{* Include here page specifc CSS file, if any *}
{if ! empty($thelia_page_css_file)}
{stylesheets file='../assets/css/$thelia_page_css_file' filters='less,cssembed'}
<link rel="stylesheet" href="{$asset_url}" target="screen">
{/stylesheets}
{/if}
{* Modules css are included here *}
{module_include location='head_css'}
</head>
<body>
@@ -59,12 +69,6 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<div class="nav-collapse">
<ul class="nav">

View File

@@ -48,14 +48,9 @@
{module_include location='index_middle'}
<div class="row-fluid feed-list">
{loop type="feed" name="thelia_feeds" url="http://thelia.net/Flux-rss.html?id_rubrique=8" limit="3"}
<div class="span4 feed-list-item">
<h3>{$DATE}</h3>
<h2><a href="#URL" target="_blank" title="{intl l='Lire la suite'}">{$TITLE|strip_tags}</a></h2>
<p>{$DESCRIPTION|strip_tags|truncate:250:"...":true}</p>
<p><a class="btn" href="#URL" target="_blank">{intl l='Lire la suite »'}</a></p>
</div>
{/loop}
<div class="span4 offset4">
<div class="well">{intl l="Loading Thelia lastest news..."}</div>
</div>
</div>
</div>
@@ -63,4 +58,12 @@
</div>
{include file='includes/js.inc.html'}
<script>
$(function () {
$(".feed-list").load("{admin_viewurl view='includes/thelia_news_feed'}");
})
</script>
{include file='includes/footer.inc.html'}