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

Minor css tuning, renamed "details" tab of categories edition to

Browse Source 
associaitons
This commit is contained in:
Franck Allimant
2013-10-30 16:32:36 +01:00
parent 86d84462ad
commit c7835758e5
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
templates/admin/default/assets/less/thelia/thelia.less
View File

@@ -338,7 +338,7 @@
// -- Drag & drop -- // -- Drag & drop --
.take{ .take{
.draggable{ .draggable{
border: 2px dashed @gray-light; border: 2px dashed @gray-light;
margin-bottom: 10px; margin-bottom: 10px;
@@ -346,9 +346,9 @@
&:last-child{ &:last-child{
margin-bottom: 0; margin-bottom: 0;
} }
} }
.over{ .over{
.drop-message{ .drop-message{
border-color: @brand-primary; border-color: @brand-primary;
@@ -358,8 +358,8 @@
} }
.place{ .place{
.over{ .over{
.drop-message{ .drop-message{
border-color: @brand-primary; border-color: @brand-primary;
@@ -368,10 +368,10 @@
} }
.panel-body{ .panel-body{
.draggable, .drag{ .draggable, .drag{
margin: 5px 0; margin: 5px 0;
padding: 10px; padding: 10px;
border: 1px dashed @gray-light; border: 1px dashed @gray-light;
} }
@@ -390,7 +390,7 @@
} }
.take, .place{ .take, .place{
.drop-message{ .drop-message{
width: 50%; width: 50%;
margin: 10px auto; margin: 10px auto;
@@ -410,4 +410,11 @@
.ui-draggable-dragging{ .ui-draggable-dragging{
z-index: 100; z-index: 100;
} }
}
// -- File Upoload drop zone ---------------------------------------------------
.dropzone {
border: 1px dashed #ddd;
padding: 20px;
} }

10
templates/admin/default/category-edit.html
View File

@@ -42,7 +42,7 @@
<ul class="nav nav-tabs" id="tabbed-menu"> <ul class="nav nav-tabs" id="tabbed-menu">
<li {if $current_tab == 'general'}class="active"{/if}><a href="#general" data-toggle="tab">{intl l="General description"}</a></li> <li {if $current_tab == 'general'}class="active"{/if}><a href="#general" data-toggle="tab">{intl l="General description"}</a></li>
<li {if $current_tab == 'details'}class="active"{/if}><a href="#details" data-toggle="tab">{intl l="Details"}</a></li> <li {if $current_tab == 'associations'}class="active"{/if}><a href="#associations" data-toggle="tab">{intl l="Associations"}</a></li>
<li {if $current_tab == 'images'}class="active"{/if}><a href="#images" data-toggle="tab">{intl l="Images"}</a></li> <li {if $current_tab == 'images'}class="active"{/if}><a href="#images" data-toggle="tab">{intl l="Images"}</a></li>
<li {if $current_tab == 'documents'}class="active"{/if}><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li> <li {if $current_tab == 'documents'}class="active"{/if}><a href="#documents" data-toggle="tab">{intl l="Documents"}</a></li>
<li {if $current_tab == 'modules'}class="active"{/if}><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li> <li {if $current_tab == 'modules'}class="active"{/if}><a href="#modules" data-toggle="tab">{intl l="Modules"}</a></li>
@@ -141,7 +141,7 @@
</div> </div>
</div> </div>
<div class="tab-pane fade {if $current_tab == 'details'}active in{/if}" id="details"> <div class="tab-pane fade {if $current_tab == 'associations'}active in{/if}" id="associations">
<div class="form-container"> <div class="form-container">
<div class="form-group"> <div class="form-group">
<form action="{url path='/admin/categories/related-content/add'}" id="related_content_form"> <form action="{url path='/admin/categories/related-content/add'}" id="related_content_form">
@@ -153,10 +153,10 @@
} }
<p class="title title-without-tabs">{intl l='Related content'}</p> <p class="title title-without-tabs">{intl l='Related content'}</p>
<p>{intl l='You can attach here some content to this product'}</p> <p>{intl l='You can attach here some content to this category'}</p>
<input type="hidden" name="category_id" value="{$category_id}" /> <input type="hidden" name="category_id" value="{$category_id}" />
<input type="hidden" name="current_tab" value="details" /> <input type="hidden" name="current_tab" value="associations" />
{ifloop rel="folders"} {ifloop rel="folders"}
<div class="row"> <div class="row">
@@ -283,7 +283,7 @@
<input type="hidden" name="content_id" id="content_delete_id" value="" /> <input type="hidden" name="content_id" id="content_delete_id" value="" />
<input type="hidden" name="folder_id" id="folder_delete_id" value="" /> <input type="hidden" name="folder_id" id="folder_delete_id" value="" />
<input type="hidden" name="current_tab" value="details" /> <input type="hidden" name="current_tab" value="associations" />
{/capture} {/capture}
{include {include