hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

add translation string & add IE7+ css compatibility

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-09-06 13:43:58 +02:00
parent 216eca67e9
commit f62be63282
5 changed files with 94 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/web/common/menubar.twig
View File

@@ -79,7 +79,13 @@
{% if module == "prod" %}
{% if user.ACL.has_access_to_module('upload') %}
<li>
<a href="/prod/upload/" class="dialog full-dialog" title="{% trans 'Upload' %}">
{% set link = '/prod/upload/flash-version/' %}
{% if browser.isHTML5() and browser.getBrowser() is not constant('Browser::BROWSER_IE') %}
{% set link = '/prod/upload/' %}
{% endif %}
<a href="{{ link }}" class="dialog full-dialog" title="{% trans 'Upload' %}">
<span>
{% trans 'admin::monitor: module upload' %}
</span>

38
templates/web/prod/upload/upload-flash.html.twig
View File

@@ -20,28 +20,28 @@
<div id="tab-upload">
<form id="fileupload" enctype="multipart/form-data" method="POST" action="/prod/upload/">
<div id="uploadBoxLeft" class="well ">
<div id="uploadBoxLeft" class="well">
{# <h5 style="margin-top: 10px;">{% trans 'Choose files to add' %} :</h5> #}
{# action bar #}
<div id="addFileList" class="span5 btn-toolbar row">
<div class="span2 upload-button">
<span id="spanSWFUploadButton" class="span2"></span>
<br />
<span class="comment">
({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %})
</span>
{# <button type="button" class="upload-submitter btn btn-inverse input-medium">{% trans 'Send' %}</button> #}
</div>
<div class="span1 uploader-icon">
<img src='/skins/icons/logo-flash.png' width="32px" heigh="32px"/>
</div>
<div class="span2 uploader-info">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
<a href="/prod/upload/" class="dialog full-dialog" title="{% trans 'Upload' %}">{% trans 'Switch' %}</a>
</div>
</div>
<table id="addFileList">
<tr>
<td class='uploader-button'>
<span id="spanSWFUploadButton" class="span2"></span>
<br />
<span class="comment">
({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %})
</span>
</td>
<td class='uploader-icon'>
<img src='/skins/icons/logo-flash.png' width="32px" heigh="32px" title="{% trans 'You are using the Flash uploader'%}"/>
</td>
<td class='uploader-info'>
<p>{% trans 'This version does not allow you to access all the features offered by the HTML5 uploader' %}</p>
<a href="/prod/upload/" class="dialog full-dialog">{% trans 'Use the HTML5 uploader' %}</a>
</td>
</tr>
</table>
{# settings box #}
<div class='settings-box'>
<h5>{% trans 'upload:: Destination (collection) :' %} :</h5>

47
templates/web/prod/upload/upload.html.twig
View File

@@ -24,27 +24,32 @@
{# <h5 style="margin-top: 10px;">{% trans 'Choose files to add' %} :</h5> #}
{# action bar #}
<div id="addFileList" class="span5 btn-toolbar row">
<div class="span2 upload-button">
<span class="btn btn-inverse fileinput-button input-medium">
<span>{% trans 'Select files...' %}</span>
<input type="file" name="files[]" multiple>
</span>
<br />
<span class="comment">
({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %})
</span>
{# <button type="button" class="upload-submitter btn btn-inverse input-medium">{% trans 'Send' %}</button> #}
</div>
<div class="span1 uploader-icon" style= "text-align:left;">
<img src='/skins/icons/html5-logo.jpeg' width="32px" heigh="32px" style='margin:10px auto;'/>
</div>
<div class="span2 uploader-info">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
<a href="/prod/upload/flash-version/" class="dialog full-dialog" title="{% trans 'Upload' %}">{% trans 'Switch' %}</a>
</div>
</div>
<table id="addFileList">
<tr>
<td class='uploader-button'>
<span class="btn btn-inverse fileinput-button input-medium">
<span>{% trans 'Select files...' %}</span>
<input type="file" name="files[]" multiple>
</span>
<br />
<span class="comment">
({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %})
</span>
</td>
<td class='uploader-icon'>
<img src='/skins/icons/html5-logo.jpeg' width="32px" heigh="32px" title="{% trans 'You are using the HTML5 uploader'%}"/>
</td>
<td class="uploader-info">
<p>
{% trans 'You are using the HTM5 uploader' %}
{% if not browser.isHTML5() or browser.getBrowser() is constant('Browser::BROWSER_IE') %}
{% trans 'Your browser does not support all HTML5 features properly' %}
{% endif %}
</p>
<a href="/prod/upload/flash-version/" class="dialog full-dialog">{% trans 'Use the Flash uploader' %}</a>
</td>
</tr>
</table>
{# settings box #}
<div class='settings-box'>

24
www/skins/prod/000000/prodcolor.css
View File

@@ -4084,18 +4084,30 @@ dans l'onglet thesaurus : arbres, menus contextuels
height: 10px;
}
#uploadBox .uploader-info {
text-align:left;
font-size:10px;
margin:5px 0;
#uploadBox .uploader-button{
text-align: center;
width:50%;
}
#uploadBox #addFileList {
width:100%;
table-layout:fixed;
border:none;
}
#uploadBox #addFileList td{
vertical-align: middle;
}
#uploadBox .uploader-icon {
width:15%;
text-align:left;
}
#uploadBox .uploader-icon img{
margin:10px auto;
#uploadBox .uploader-info {
font-size:10px;
width:35%;
text-align:left;
}
#uploadBox .uploader-info p {

36
www/skins/prod/959595/prodcolor.css
View File

@@ -4215,19 +4215,37 @@ dans l'onglet thesaurus : arbres, menus contextuels
font-style: normal;
}
#uploadBoxRight .progress {
margin-top: 4px;
margin-bottom: 10px;
height: 10px;
}
#uploadBox .uploader-info {
text-align:left;
font-size:10px;
margin:5px 0;
#uploadBox .uploader-button{
text-align: center;
width:50%;
}
#uploadBox #addFileList {
width:100%;
table-layout:fixed;
border:none;
}
#uploadBox #addFileList td{
vertical-align: middle;
}
#uploadBox .uploader-icon {
width:15%;
text-align:left;
}
#uploadBox .uploader-icon img{
margin:10px auto;
#uploadBox .uploader-info {
font-size:10px;
width:35%;
text-align:left;
}
#uploadBox .uploader-info p {
@@ -4242,12 +4260,6 @@ dans l'onglet thesaurus : arbres, menus contextuels
margin:5px 0;
}
#uploadBoxRight .progress {
margin-top: 4px;
margin-bottom: 10px;
height: 10px;
}
#uploadBoxRight .progress .progress-bar {
height: 10px;
}