Commit 231987a3 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Styled the file upload page and put the help button in it's rightful place - Bug #1465107"

parents 60eb6465 d3248dd3
......@@ -14,7 +14,7 @@
{/if}
{if $institution && !ADMIN}
<div class="row">
<div class='col-md-10'>
......@@ -31,4 +31,3 @@
{include file="footer.tpl"}
......@@ -85,15 +85,6 @@
{/if}
</div>
{if $config.resizeonuploaduseroption}
<div id="{$prefix}_resizeonuploaduseroption" class="description">
{str tag='resizeonuploadenablefilebrowser1' section='artefact.file' arg1=$resizeonuploadmaxwidth arg2=$resizeonuploadmaxheight}
<input type="checkbox" name="{$prefix}_resizeonuploaduserenable" id="{$prefix}_resizeonuploaduserenable" {if $resizeonuploadenable && $config.resizeonuploaduserdefault}checked{/if} />
{contextualhelp plugintype='artefact' pluginname='file' form='files_filebrowser' element='resizeonuploaduseroption'}
</div>
{/if}
<div id="file_dropzone_container" class="{$prefix}">
<div id="fileDropzone" class="dropzone-previews" style="display:none;">
<div class="dz-message">{str tag=dragdrophere section=artefact.file}</div>
......@@ -112,6 +103,15 @@
</div>
</div>
{if $config.resizeonuploaduseroption}
<div id="{$prefix}_resizeonuploaduseroption" class="description mbl">
{str tag='resizeonuploadenablefilebrowser1' section='artefact.file' arg1=$resizeonuploadmaxwidth arg2=$resizeonuploadmaxheight}
<input type="checkbox" name="{$prefix}_resizeonuploaduserenable" id="{$prefix}_resizeonuploaduserenable" {if $resizeonuploadenable && $config.resizeonuploaduserdefault}checked{/if} />
<span class="help-inline">{contextualhelp plugintype='artefact' pluginname='file' form='files_filebrowser' element='resizeonuploaduseroption'}</span>
</div>
{/if}
{$licenseform|safe}
</div>
{/if}
......
......@@ -455,6 +455,14 @@
margin-top:-20px;
}
.help-inline {
.help {
top: auto;
margin-top: 0;
right:auto;
}
}
.errmsg {
@extend .align-with-input;
color: $brand-danger;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment