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

enhance uploader informations

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-09-06 11:11:42 +02:00
parent aa0041be3b
commit 216eca67e9
6 changed files with 75 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,19 +24,22 @@
{# <h5 style="margin-top: 10px;">{% trans 'Choose files to add' %} :</h5> #} {# <h5 style="margin-top: 10px;">{% trans 'Choose files to add' %} :</h5> #}
{# action bar #} {# action bar #}
<div id="addFileList"> <div id="addFileList" class="span5 btn-toolbar row">
<div class="btn-toolbar"> <div class="span2 upload-button">
<span id="spanSWFUploadButton" class="span2"></span> <span id="spanSWFUploadButton" class="span2"></span>
<br /> <br />
<span>
<a href="/prod/upload/" class="dialog full-dialog" title="{% trans 'Upload' %}"><span class="label label-info"><i>{% trans 'Switch to html5 uploader' %}</i></span></a>
</span>
<br />
<span class="comment"> <span class="comment">
({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %}) ({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %})
</span> </span>
{# <button type="button" class="upload-submitter btn btn-inverse input-medium">{% trans 'Send' %}</button> #} {# <button type="button" class="upload-submitter btn btn-inverse input-medium">{% trans 'Send' %}</button> #}
</div> </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> </div>
{# settings box #} {# settings box #}
@@ -105,6 +108,7 @@
</div> </div>
<div id="uploadBoxRight" class="well"> <div id="uploadBoxRight" class="well">
<h5 style="margin-top: 10px;">{% trans 'Transmited files' %} : </h5>
<div class='well-small'> <div class='well-small'>
<button id="cancel-all" class="btn disabled" type="button" disabled="disabled"> <button id="cancel-all" class="btn disabled" type="button" disabled="disabled">
{% trans "Cancel all" %} {% trans "Cancel all" %}

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

@@ -24,22 +24,26 @@
{# <h5 style="margin-top: 10px;">{% trans 'Choose files to add' %} :</h5> #} {# <h5 style="margin-top: 10px;">{% trans 'Choose files to add' %} :</h5> #}
{# action bar #} {# action bar #}
<div id="addFileList"> <div id="addFileList" class="span5 btn-toolbar row">
<div class="btn-toolbar"> <div class="span2 upload-button">
<span class="btn btn-inverse fileinput-button input-medium"> <span class="btn btn-inverse fileinput-button input-medium">
<span>{% trans 'Select files...' %}</span> <span>{% trans 'Select files...' %}</span>
<input type="file" name="files[]" multiple> <input type="file" name="files[]" multiple>
</span> </span>
<br /> <br />
<span>
<a href="/prod/upload/flash-version/" class="dialog full-dialog" title="{% trans 'Upload' %}"><span class="label label-info"><i>{% trans 'Switch to flash uploader' %}</i></span></a>
</span>
<br />
<span class="comment"> <span class="comment">
({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %}) ({% trans %} maximum : {{ maxFileSizeReadable }} {% endtrans %})
</span> </span>
{# <button type="button" class="upload-submitter btn btn-inverse input-medium">{% trans 'Send' %}</button> #} {# <button type="button" class="upload-submitter btn btn-inverse input-medium">{% trans 'Send' %}</button> #}
</div> </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> </div>
{# settings box #} {# settings box #}

BIN
www/skins/icons/html5-logo.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 755 B

BIN
www/skins/icons/logo-flash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

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

@@ -4084,6 +4084,32 @@ dans l'onglet thesaurus : arbres, menus contextuels
height: 10px; height: 10px;
} }
#uploadBox .uploader-info {
text-align:left;
font-size:10px;
margin:5px 0;
}
#uploadBox .uploader-icon {
text-align:left;
}
#uploadBox .uploader-icon img{
margin:10px auto;
}
#uploadBox .uploader-info p {
line-height:10px;
font-size:10px;
word-wrap: break-word;
}
#uploadBox .uploader-info a {
text-decoration: underline;
color: darkblue;
margin:5px 0;
}
#uploadBoxRight .progress .progress-bar { #uploadBoxRight .progress .progress-bar {
height: 10px; height: 10px;
} }

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

@@ -4215,6 +4215,33 @@ dans l'onglet thesaurus : arbres, menus contextuels
font-style: normal; font-style: normal;
} }
#uploadBox .uploader-info {
text-align:left;
font-size:10px;
margin:5px 0;
}
#uploadBox .uploader-icon {
text-align:left;
}
#uploadBox .uploader-icon img{
margin:10px auto;
}
#uploadBox .uploader-info p {
line-height:10px;
font-size:10px;
word-wrap: break-word;
}
#uploadBox .uploader-info a {
text-decoration: underline;
color: darkblue;
margin:5px 0;
}
#uploadBoxRight .progress { #uploadBoxRight .progress {
margin-top: 4px; margin-top: 4px;
margin-bottom: 10px; margin-bottom: 10px;