aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-10-31 14:33:41 +0100
committermarijus <mario@mariovavti.com>2014-10-31 14:33:41 +0100
commit2982212797dd64e1be13de20dc158842734ee5f8 (patch)
tree4c190a075ad732348c16260387b8a64c16a0292b /view
parent11ccf253e213fbd71916a53220bb05a18f58808f (diff)
downloadvolse-hubzilla-2982212797dd64e1be13de20dc158842734ee5f8.tar.gz
volse-hubzilla-2982212797dd64e1be13de20dc158842734ee5f8.tar.bz2
volse-hubzilla-2982212797dd64e1be13de20dc158842734ee5f8.zip
more work on photo upload
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_photos.css15
-rw-r--r--view/css/widgets.css3
-rw-r--r--view/theme/redbasic/css/style.css10
-rwxr-xr-xview/tpl/photos_upload.tpl41
4 files changed, 36 insertions, 33 deletions
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index 3832ea1a6..89041bd09 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -22,24 +22,16 @@
margin-bottom: 25px;
}
-#photos-upload-noshare {
- margin-bottom: 10px;
+#photos-upload-album {
+ width: 100%;
}
-#photos-upload-spacer,
-#photos-upload-new-end {
- margin-top: 25px;
-}
#photos-upload-new-end, #photos-upload-exist-end {
clear: both;
}
#photos-upload-exist-end {
margin-bottom: 15px;
}
-#photos-upload-submit {
- margin-top: 15px;
-}
-
#photos-upload-select-files-text {
margin-top: 15px;
@@ -63,8 +55,9 @@
margin-bottom: 15px;
}
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end, #photos-upload-perms-end, #photos-upload-noshare-end{
clear: both;
+ margin-bottom: 10px;
}
#photo-edit-rotate-end {
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 593e051da..df113b12e 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -26,9 +26,6 @@
/* search */
#search-text {
- border: 1px solid #ccc;
- padding: 5px;
- line-height: 1.5;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 31b769460..5ffc33d31 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -13,7 +13,7 @@ html {
}
body {
- font-family: arial,freesans,sans-serif;
+ font-family: sans-serif, arial, freesans;
font-size: $body_font_size;
background-color: $bgcolour;
background-image: url('$background_image');
@@ -37,7 +37,7 @@ h5, .h5, h6, .h6 {
}
.jslider {
- font-family: arial,freesans,sans-serif;
+ font-family: sans-serif, arial, freesans;
}
abbr {
@@ -84,17 +84,19 @@ a.btn-success {
input[type="text"],
input[type="password"],
input[type="submit"],
+input[type="file"],
select,
textarea {
- font-family: arial,freesans,sans-serif;
+ font-family: sans-serif, arial, freesans;
font-size: $body_font_size;
}
input {
+ padding: 5px;
+ line-height: 1.5;
border: 1px solid $input_border;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;
- padding: 3px;
}
input[type="submit"] {
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 3db292f02..4c53a7c62 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -8,11 +8,11 @@
<div class="section-content-wrapper">
<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
<input type="hidden" id="photos-upload-source" name="source" value="photos" />
- <div id="photos-album-name-label" >
- <label id="photos-upload-newalbum-text" for="photos-upload-newalbum">{{$newalbum}}</label>
- </div>
- <div id="photos-album-name-input">
- <input id="photos-upload-newalbum" type="text" value="{{$selname}}" name="newalbum" list="dl-photo-upload" />
+
+
+ <div class="form-group">
+ <label for="photos-upload-album">{{$newalbum_label}}</label>
+ <input type="text" class="form-control" id="photos-upload-album" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload">
<datalist id="dl-photo-upload">
{{foreach $albums as $al}}
{{if $al.text}}
@@ -22,27 +22,38 @@
</datalist>
</div>
+ {{$aclselect}}
+
+ {{if $default}}
+ <div class="form-group pull-left">
+ <input id="photos-upload-choose" type="file" name="userfile" />
+ </div>
+ <div class="btn-group pull-right">
+ <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+ <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
+ </button>
+ <button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-upload-submit">{{$submit}}</button>
+ </div>
+ {{/if}}
+
<div id="photos-upload-new-end"></div>
- <div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
- <input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
- <label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+ <div class="form-group" id="photos-upload-noshare">
+ <label id="photos-upload-noshare-text" for="photos-upload-noshare" >
+ <input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />&nbsp;{{$nosharetext}}
+ </label>
</div>
+ {{if $uploader}}
+ <div id="photos-upload-noshare-end"></div>
<div id="photos-upload-perms" class="photos-upload-perms" >
<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
</div>
-
- {{$aclselect}}
-
<div id="photos-upload-perms-end"></div>
-
- <div id="photos-upload-spacer"></div>
-
{{$uploader}}
+ {{/if}}
- {{$default}}
<div class="photos-upload-end" ></div>
</form>