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

Minor adjustements

Browse Source
This commit is contained in:
Franck Allimant
2013-10-30 17:31:02 +01:00
parent c7835758e5
commit 3019d36356
8 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/admin/default/assets/js/document-upload.js
View File

@@ -4,7 +4,7 @@ $(function($){
Dropzone.autoDiscover = false; Dropzone.autoDiscover = false;
// Remove image on click // Remove image on click
$.documentUploadManager.initDocumentDropZone = function() { $.documentUploadManager.initDocumentDropZone = function() {
@@ -14,7 +14,7 @@ $(function($){
dictDefaultMessage : $('.btn-browse').html(), dictDefaultMessage : $('.btn-browse').html(),
uploadMultiple: false, uploadMultiple: false,
maxFilesize: 8 maxFilesize: 8
}); });
var totalFiles = 0, var totalFiles = 0,
completedFiles = 0; completedFiles = 0;
@@ -40,8 +40,8 @@ $(function($){
$.documentUploadManager.updateDocumentListAjax(); $.documentUploadManager.updateDocumentListAjax();
$.documentUploadManager.onClickDeleteDocument(); $.documentUploadManager.onClickDeleteDocument();
}); });
}; };

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

@@ -336,6 +336,13 @@
} }
} }
.existing-document {
.loading{
margin: 0;
}
}
// -- Drag & drop -- // -- Drag & drop --
.take{ .take{

4
templates/admin/default/content-edit.html
View File

@@ -9,7 +9,7 @@
<div class="folder edit-folder"> <div class="folder edit-folder">
<div id="wrapper" class="container"> <div id="wrapper" class="container">
{include file="includes/folder-breadcrumb.html" editing_category="false" editing_content="true"} {include file="includes/folder-breadcrumb.html" editing_content="true"}
<div class="row"> <div class="row">
{loop name="content_edit" type="content" visible="*" id="{$content_id}" backend_context="1" lang="$edit_language_id"} {loop name="content_edit" type="content" visible="*" id="{$content_id}" backend_context="1" lang="$edit_language_id"}
@@ -131,7 +131,7 @@
<div class="control-group"> <div class="control-group">
<lablel>&nbsp;</lablel> <lablel>&nbsp;</lablel>
<div class="controls"> <div class="controls">
<p>{intl l='Colder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p> <p>{intl l='Folder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p>
</div> </div>
</div> </div>
</div> </div>

4
templates/admin/default/folder-edit.html
View File

@@ -9,7 +9,7 @@
<div class="folder edit-folder"> <div class="folder edit-folder">
<div id="wrapper" class="container"> <div id="wrapper" class="container">
{include file="includes/folder-breadcrumb.html" editing_category="true" } {include file="includes/folder-breadcrumb.html" }
<div class="row"> <div class="row">
{loop name="folder_edit" type="folder" visible="*" id="{$folder_id}" backend_context="1" lang="$edit_language_id"} {loop name="folder_edit" type="folder" visible="*" id="{$folder_id}" backend_context="1" lang="$edit_language_id"}
@@ -182,7 +182,7 @@
</span> </span>
</div> </div>
<span class="help-block">{intl l='Select a content and click (+) to add it to this category'}</span> <span class="help-block">{intl l='Select a content and click (+) to add it to this folder'}</span>
</div> </div>
</div> </div>

7
templates/admin/default/folders.html
View File

@@ -28,12 +28,7 @@
{elseloop rel="folder_title"} {elseloop rel="folder_title"}
{intl l="Top level folders"} {intl l="Top level folders"}
{/elseloop} {/elseloop}
{*
<td class="object-title">
<a href="{url path='admin/folders' parent=$ID}" title="{intl l='Browse this folder'}">
{$TITLE}
</a>
</td>*}
{module_include location='folder_list_caption'} {module_include location='folder_list_caption'}
{loop type="auth" name="can_create" role="ADMIN" resource="admin.folder" access="CREATE"} {loop type="auth" name="can_create" role="ADMIN" resource="admin.folder" access="CREATE"}

2
templates/admin/default/includes/content-folder-management.html
View File

@@ -6,7 +6,7 @@
<div class="form-group"> <div class="form-group">
<form method="POST" action="{url path='/admin/content/folder/add'}" id="related_content_form"> <form method="POST" action="{url path='/admin/content/folder/add'}" id="related_content_form">
<p class="title title-without-tabs">{intl l='Additional categories'}</p> <p class="title title-without-tabs">{intl l='Additional Folders'}</p>
<p>{intl l='A content could be attached to more than one folder. Select here the additional fodlers for this content.'} <p>{intl l='A content could be attached to more than one folder. Select here the additional fodlers for this content.'}
{loop name="default_folder" type="folder" id=$DEFAULT_FOLDER} {loop name="default_folder" type="folder" id=$DEFAULT_FOLDER}
{intl l='You can change the default folder (%title) in the "General" tab.' title=$TITLE} {intl l='You can change the default folder (%title) in the "General" tab.' title=$TITLE}

3
templates/admin/default/includes/document-upload-list-ajax.html
View File

@@ -29,3 +29,6 @@ Parameters:
{/loop} {/loop}
</table> </table>
{/ifloop} {/ifloop}
{elseloop rel="document"}
<div class="alert alert-info">{intl l='There is no documents attached to this %type.' type=$documentType}</div>
{/elseloop}

5
templates/admin/default/includes/image-upload-list-ajax.html
View File

@@ -27,4 +27,7 @@ Parameters:
</div> </div>
{/loop} {/loop}
</div> </div>
{/ifloop} {/ifloop}
{elseloop rel="image"}
<div class="alert alert-info">{intl l='There is no images attached to this %type.' type=$imageType}</div>
{/elseloop}