aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--view/css/mod_cloud.css3
-rw-r--r--view/css/mod_photos.css3
-rw-r--r--view/tpl/cloud_actionspanel.tpl3
-rwxr-xr-xview/tpl/photos_upload.tpl7
4 files changed, 9 insertions, 7 deletions
diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css
index 7cbcc8807..76ac82690 100644
--- a/view/css/mod_cloud.css
+++ b/view/css/mod_cloud.css
@@ -38,5 +38,6 @@
}
#files-upload {
- padding: 2px;
+ padding: 4px;
+ width: 100%;
}
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index 6fefad8e4..a2b3459cf 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -25,5 +25,6 @@
}
#photos-upload-choose {
- padding: 2px;
+ padding: 4px;
+ width: 100%;
}
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 0e621e9db..da708a98c 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -8,9 +8,10 @@
<div class="clear"></div>
</div>
<div id="files-upload-tools" class="section-content-tools-wrapper form-group">
+ <label for="files-upload">{{$upload_header}}</label>
<form method="post" action="" enctype="multipart/form-data">
<input type="hidden" name="sabreAction" value="put">
- <input class="pull-left" id="files-upload" type="file" name="file">
+ <input class="form-group" id="files-upload" type="file" name="file">
<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
<!-- Name (optional): <input type="text" name="name"> we should rather provide a rename action in edit form-->
</form>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 10fc82648..0b3a0ae81 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -18,7 +18,7 @@
{{$aclselect}}
{{if $default}}
- <div class="pull-left">
+ <div class="form-group">
<input id="photos-upload-choose" type="file" name="userfile" />
</div>
<div class="btn-group pull-right">
@@ -29,13 +29,12 @@
</div>
{{/if}}
- <div class="clear"></div>
-
- <div class="checkbox">
+ <div class="checkbox pull-left">
<label class="checkbox-inline" for="photos-upload-noshare" >
<input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />{{$nosharetext}}
</label>
</div>
+ <div class="clear"></div>
{{if $uploader}}
<div id="photos-upload-perms" class="pull-right">