dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// added fixed toolbar, norms

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9904 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-11-04 17:32:46 +00:00
parent 601c4ded53
commit 100dc43616
10 changed files with 79 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/admin.css
+2 -1
View File
@@ -169,4 +169,5 @@ form.defaultForm{ background-color:#ebedf4; border:1px solid #ccced7; min-heig
.product-tab-content h4.tab { display:none;}
/*FOOTER*/
#footer {height:40px;background:#ECEADE url(footer-bg.png) repeat-x scroll left bottom;border:1px solid #999999;font-size:12px;clear:both;font-size:0.9em;color:#666666}
#footer {height:40px;background:#ECEADE url(footer-bg.png) repeat-x scroll left bottom;border:1px solid #999999;font-size:12px;clear:both;font-size:0.9em;color:#666666}
div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;}
admin-dev/themes/template/footer.tpl
+33 -3
View File
@@ -37,9 +37,9 @@
{if $iso_is_fr}
<span style="color: #812143; font-weight: bold;">Questions / Renseignements / Formations :</span> <strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h
{/if}
| <a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
| <a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
| <a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>
|&nbsp;<a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
|&nbsp;<a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>
</div>
</div>
</div>
@@ -53,5 +53,35 @@
}
</script>
{/if}
<script type="text/javascript">
$(document).ready(function(){
var placeholder = $(".toolbar-placeholder");
var message = $('.toolbarHead');
var view = $(window);
// bind only if placeholder exists
if (placeholder.length)
view.bind("scroll resize", function(e)
{
if(e.type == 'resize')
message.css('width', message.width());
var placeholderTop = placeholder.offset().top;
var viewTop = view.scrollTop() + 15;
if ((viewTop > placeholderTop) && !message.hasClass("fix-toolbar"))
{
message.css('width', message.width());
message.addClass("fix-toolbar");
}
else if ( (viewTop <= placeholderTop) && message.hasClass("fix-toolbar"))
{
message.css('width', 'auto');
message.removeClass("fix-toolbar");
}
});
});
</script>
</body>
</html>
admin-dev/themes/template/helper/form/form.tpl
+3 -1
View File
@@ -64,7 +64,8 @@
</script>
<script type="text/javascript" src="../js/form.js"></script>
{/if}
<div class="toolbarBox">
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
{if $show_toolbar}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
@@ -75,6 +76,7 @@
{/if}
<div class="leadin">{block name="leadin"}{/block}</div>
</div>
</div>
{if isset($fields.title)}<h2>{$fields.title}</h2>{/if}
<form id="{$table}_form" class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
{if $form_id}
admin-dev/themes/template/helper/list/list_footer.tpl
-5
View File
@@ -37,8 +37,3 @@
</table>
<input type="hidden" name="token" value="{$token}" />
</form>
{*
if (isset($this->_includeTab) AND sizeof($this->_includeTab))
echo '<br /><br />';
*}
admin-dev/themes/template/helper/list/list_header.tpl
+3 -1
View File
@@ -60,7 +60,8 @@
{/if}{* End if simple_header *}
{if $show_toolbar}
<div class="toolbarBox">
<div class="toolbar-placeholder">
<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
<div class="pageTitle">
<h3>{block name=pageTitle}
@@ -68,6 +69,7 @@
{/block}</h3>
</div>
</div>
</div>
{/if}
<div class="leadin">{block name="leadin"}{/block}</div>
<a name="{$table}">&nbsp;</a>