harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more work on photo upload

Browse Source
This commit is contained in:
marijus 2014-10-31 14:33:41 +01:00
parent 11ccf253e2
commit 2982212797
5 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mod/photos.php
View File

@ -540,12 +540,8 @@ function photos_content(&$a) {
'addon_text' => $uploader,
'default_upload' => true);
call_hooks('photo_upload_form',$ret);
$default_upload = '<input id="photos-upload-choose" type="file" name="userfile" /> <div class="photos-upload-submit-wrapper" >
<input type="submit" name="submit" value="' . t('Submit') . '" id="photos-upload-submit" /> </div>';
/* Show space usage */
$r = q("select sum(size) as total from photo where aid = %d and scale = 0 ",
@ -584,15 +580,17 @@ function photos_content(&$a) {
'$sessid' => session_id(),
'$usage' => $usage_message,
'$nickname' => $a->data['channel']['channel_address'],
'$newalbum' => t('Enter a new album name or select an existing one:'),
'$newalbum_label' => t('Enter a new album name'),
'$newalbum_placeholder' => t('or select an existing one (doubleclick)'),
'$nosharetext' => t('Do not show a status post for this upload'),
'$albums' => $albums['albums'],
'$selname' => $selname,
'$permissions' => t('Permissions'),
'$aclselect' => $aclselect_e,
'$uploader' => $ret['addon_text'],
'$default' => (($ret['default_upload']) ? $default_upload : ''),
'$uploadurl' => $ret['post_url']
'$default' => (($ret['default_upload']) ? true : false),
'$uploadurl' => $ret['post_url'],
'$submit' => t('Submit')
));

15
view/css/mod_photos.css
View File

@ -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 {

3
view/css/widgets.css
View File

@ -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;
}

10
view/theme/redbasic/css/style.css
View File

@ -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"] {

41
view/tpl/photos_upload.tpl
View File

@ -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>