diff options
| -rw-r--r-- | include/RedDAV/RedBrowser.php | 6 | ||||
| -rw-r--r-- | include/attach.php | 2 | ||||
| -rw-r--r-- | mod/filestorage.php | 8 | ||||
| -rw-r--r-- | mod/manage.php | 7 | ||||
| -rw-r--r-- | mod/ping.php | 4 | ||||
| -rw-r--r-- | util/po2php.php | 18 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/css/mod_cloud.css | 16 | ||||
| -rw-r--r-- | view/css/mod_manage.css | 30 | ||||
| -rw-r--r-- | view/css/mod_photos.css | 4 | ||||
| -rw-r--r-- | view/js/main.js | 10 | ||||
| -rw-r--r-- | view/js/mod_photos.js | 10 | ||||
| -rw-r--r-- | view/theme/redbasic/css/mod_events.css | 23 | ||||
| -rw-r--r-- | view/theme/redbasic/css/mod_group.php | 32 | ||||
| -rw-r--r-- | view/theme/redbasic/css/mod_profile_photo.css | 10 | ||||
| -rw-r--r-- | view/theme/redbasic/css/mod_profiles.css | 39 | ||||
| -rw-r--r-- | view/theme/redbasic/css/mod_profperm.css | 32 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 166 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_aside.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/attach_edit.tpl | 43 | ||||
| -rwxr-xr-x | view/tpl/channel.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/channels.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/cloud_actionspanel.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 38 |
25 files changed, 260 insertions, 265 deletions
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php index d07f60083..709f6339b 100644 --- a/include/RedDAV/RedBrowser.php +++ b/include/RedDAV/RedBrowser.php @@ -342,6 +342,7 @@ class RedBrowser extends DAV\Browser\Plugin { 'application/octet-stream' => 'icon-file-alt', //Text + 'text/plain' => 'icon-file-text-alt', 'application/msword' => 'icon-file-text-alt', 'application/pdf' => 'icon-file-text-alt', 'application/vnd.oasis.opendocument.text' => 'icon-file-text-alt', @@ -365,6 +366,11 @@ class RedBrowser extends DAV\Browser\Plugin { 'audio/mpeg' => 'icon-music', 'audio/wav' => 'icon-music', 'application/ogg' => 'icon-music', + + //Video + 'video/quicktime' => 'icon-film', + + ); $iconFromType = 'icon-file-alt'; diff --git a/include/attach.php b/include/attach.php index ad6ca1b21..a76dd4b28 100644 --- a/include/attach.php +++ b/include/attach.php @@ -717,7 +717,7 @@ function attach_change_permissions($channel_id, $resource, $allow_cid, $allow_gi ); if($r) { foreach($r as $rr) { - attach_change_permissions($channel_id, $resource, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $recurse); + attach_change_permissions($channel_id, $rr['hash'], $allow_cid, $allow_gid, $deny_cid, $deny_gid, $recurse); } } } diff --git a/mod/filestorage.php b/mod/filestorage.php index 1767ea6bf..6b731e440 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -32,7 +32,7 @@ function filestorage_post(&$a) { $str_group_deny = perms2str($_REQUEST['group_deny']); $str_contact_deny = perms2str($_REQUEST['contact_deny']); - attach_change_permissions($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny,$str_group_deny, $recurse = false); + attach_change_permissions($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $recurse); //Build directory tree and redirect $channel = $a->get_channel(); @@ -127,10 +127,14 @@ function filestorage_content(&$a) { $lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock'); + // Encode path that is used for link so it's a valid URL + // Keep slashes as slashes, otherwise mod_rewrite doesn't work correctly + $encoded_path = str_replace('%2F', '/', rawurlencode($cloudpath)); + $o = replace_macros(get_markup_template('attach_edit.tpl'), array( '$header' => t('Edit file permissions'), '$file' => $f, - '$cloudpath' => z_root() . '/' . $cloudpath, + '$cloudpath' => z_root() . '/' . $encoded_path, '$parentpath' => $parentpath, '$uid' => $channel['channel_id'], '$channelnick' => $channel['channel_address'], diff --git a/mod/manage.php b/mod/manage.php index 21327a120..b0de945bf 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -46,15 +46,12 @@ function manage_content(&$a) { intval(PAGE_REMOVED) ); - $selected_channel = null; $account = get_app()->get_account(); if($r && count($r)) { $channels = $r; for($x = 0; $x < count($channels); $x ++) { $channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']); - if($channels[$x]['channel_id'] == local_user()) - $selected_channel = &$channels[$x]; // Needs to be a reference! $channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : ''); $channels[$x]['default_links'] = '1'; @@ -152,8 +149,8 @@ function manage_content(&$a) { $o = replace_macros(get_markup_template('channels.tpl'), array( '$header' => t('Channel Manager'), '$msg_selected' => t('Current Channel'), - '$selected' => $selected_channel, - '$desc' => t('Attach to one of your channels by selecting it.'), + '$selected' => local_user(), + '$desc' => t('Switch to one of your channels by selecting it.'), '$msg_default' => t('Default Channel'), '$msg_make_default' => t('Make Default'), '$links' => $links, diff --git a/mod/ping.php b/mod/ping.php index cdb6aa0b2..593ae21f8 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -277,7 +277,7 @@ function ping_init(&$a) { $r = q("SELECT * FROM item WHERE item_restrict = %d and ( item_flags & %d ) > 0 and uid = %d - and author_xchan != '%s' ", + and author_xchan != '%s' ORDER BY created DESC", intval(ITEM_VISIBLE), intval(ITEM_UNSEEN), intval(local_user()), @@ -300,7 +300,7 @@ function ping_init(&$a) { if(argc() > 1 && (argv(1) === 'intros')) { $result = array(); - $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0)", + $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0) ORDER BY abook_created DESC", intval(local_user()), intval(ABOOK_FLAG_PENDING), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), diff --git a/util/po2php.php b/util/po2php.php index d3e6d190c..cf295d8cb 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -73,7 +73,7 @@ function po2php_run($argv, $argc) { } $match=Array(); preg_match("|\[([0-9]*)\] (.*)|", $l, $match); - $out .= "\t". + $out .= "\t". preg_replace_callback($escape_s_exp,'escape_s',$match[1]) ." => " .preg_replace_callback($escape_s_exp,'escape_s',$match[2]) .",\n"; @@ -83,7 +83,7 @@ function po2php_run($argv, $argc) { if ($ink) { - $k .= trim($l,"\"\r\n"); + $k .= trim_message($l); $k = preg_replace_callback($escape_s_exp,'escape_s',$k); //$out .= '$a->strings['.$k.'] = '; } @@ -93,7 +93,7 @@ function po2php_run($argv, $argc) { if ($k!="") $out .= $arr?");\n":";\n"; $arr=False; $k = str_replace("msgid ","",$l); - $k = trim($k,"\"\r\n"); + $k = trim_message($k); $k = $ctx.$k; // echo $ctx ? $ctx."\nX\n":""; $k = preg_replace_callback($escape_s_exp,'escape_s',$k); @@ -102,14 +102,14 @@ function po2php_run($argv, $argc) { } if ($inv && substr($l,0,6)!="msgstr" && substr($l,0,7)!="msgctxt") { - $v .= trim($l,"\"\r\n"); + $v .= trim_message($l); $v = preg_replace_callback($escape_s_exp,'escape_s',$v); //$out .= '$a->strings['.$k.'] = '; } if (substr($l,0,7)=="msgctxt") { $ctx = str_replace("msgctxt ","",$l); - $ctx = trim($ctx,"\"\r\n"); + $ctx = trim_message($ctx); $ctx = "__ctx:".$ctx."__ "; $ctx = preg_replace_callback($escape_s_exp,'escape_s',$ctx); } @@ -123,6 +123,14 @@ function po2php_run($argv, $argc) { } +function trim_message($str) { + // Almost same as trim("\"\r\n") except that escaped quotes are preserved + $str = trim($str, "\r\n"); + $str = ltrim($str, "\""); + $str = preg_replace('/(?<!\\\)"+$/', '', $str); + return $str; +} + if (array_search(__file__,get_included_files())===0){ po2php_run($argv,$argc); } diff --git a/version.inc b/version.inc index 43e85b852..1e16c4f7e 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-12-28.903 +2014-12-29.904 diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css index 56f4c415b..76ac82690 100644 --- a/view/css/mod_cloud.css +++ b/view/css/mod_cloud.css @@ -2,7 +2,10 @@ #files-upload-tools, [id^="perms-panel-"] { display: none; - padding: 3px 10px 3px 10px !important; +} + +[id^="perms-panel-"] { + padding: 3px 10px 0px 10px !important; } #attach-code, @@ -14,19 +17,17 @@ width: 100%; } -#cloud-index th { - padding-top: 7px; -} - #cloud-index td:nth-child(1){ padding: 7px 3px 7px 10px; } +#cloud-index th:nth-child(8), #cloud-index td:nth-child(8){ padding: 7px 3px; white-space: nowrap; } +#cloud-index th:nth-child(9), #cloud-index td:nth-child(9){ padding: 7px 10px 7px 7px; white-space: nowrap; @@ -35,3 +36,8 @@ .cloud-index-tool { padding: 7px 10px; } + +#files-upload { + padding: 4px; + width: 100%; +} diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css index 161b46757..bb7ef566d 100644 --- a/view/css/mod_manage.css +++ b/view/css/mod_manage.css @@ -1,7 +1,6 @@ #channels-selected { color: #666666; font-size: 0.8em; - } #channels-desc { @@ -14,33 +13,23 @@ .channels-break { margin-bottom: 15px; } -#selected-channel { - float: left; - margin-left: 0; -} - -.channels-end.selected { - clear: both; -} - -#selected-channel .channel-selection { - clear: both; - margin: 0 auto 0 auto; -} .channel-selection-default { font-size: 0.8em; margin-bottom: 10px; } -#all-channels .channel-selection { +.channel-selection { width: 12em; height: 16em; float: left; - margin: 0 15px 15px 0; + text-align: center; } -.channels-end { - clear: both; + +.channel-selection img { + display: block; + margin-left: auto; + margin-right: auto; } .channel-selection-name-link { @@ -50,7 +39,6 @@ .channel-selection-name-link .channel-name { padding-top: 10px; - text-align: left; word-wrap: break-word; overflow: hidden; } @@ -59,3 +47,7 @@ clear: both; padding-top: 10px; } + +.selected-channel img { + border: 2px solid #ff0000; +} diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 34bac51e9..a2b3459cf 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -25,6 +25,6 @@ } #photos-upload-choose { - border: unset; - padding: unset; + padding: 4px; + width: 100%; } diff --git a/view/js/main.js b/view/js/main.js index 104718436..8c48bbb72 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -468,7 +468,7 @@ function updateConvItems(mode,data) { $('#' + prev).after($(this)); if(isVisible) showHideComments(itmId); - $(".autotime").timeago(); + $(".autotime",this).timeago(); } else { $('img',this).each(function() { @@ -479,7 +479,7 @@ function updateConvItems(mode,data) { $('#' + ident).replaceWith($(this)); if(isVisible) showHideComments(itmId); - $(".autotime").timeago(); + $(".autotime",this).timeago(); } prev = ident; }); @@ -510,7 +510,7 @@ function updateConvItems(mode,data) { $('#threads-end').before($(this)); if(isVisible) showHideComments(itmId); - $(".autotime").timeago(); + $(".autotime",this).timeago(); } else { $('img',this).each(function() { @@ -521,7 +521,7 @@ function updateConvItems(mode,data) { $('#' + ident).replaceWith($(this)); if(isVisible) showHideComments(itmId); - $(".autotime").timeago(); + $(".autotime",this).timeago(); } }); @@ -555,7 +555,7 @@ function updateConvItems(mode,data) { $('#' + prev).after($(this)); if(isVisible) showHideComments(itmId); - $(".autotime").timeago(); + $(".autotime",this).timeago(); } prev = ident; diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js index 8b7706f16..0a64f8102 100644 --- a/view/js/mod_photos.js +++ b/view/js/mod_photos.js @@ -3,16 +3,6 @@ var ispublic = aStr['everybody']; $(document).ready(function() { - $("a#photos-upload-perms-menu").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); - - $("a#settings-default-perms-menu").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); - var a; a = $("#photo-edit-newtag").autocomplete({ serviceUrl: baseurl + '/acl', diff --git a/view/theme/redbasic/css/mod_events.css b/view/theme/redbasic/css/mod_events.css new file mode 100644 index 000000000..4b93932f0 --- /dev/null +++ b/view/theme/redbasic/css/mod_events.css @@ -0,0 +1,23 @@ +#event-start-text, #event-finish-text { + margin-top: 10px; + margin-bottom: 5px; +} + +#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text { + float: left; +} +#event-datetime-break { + margin-bottom: 10px; +} + +#event-nofinish-break, #event-adjust-break { + clear: both; +} + +#event-desc-text, #event-location-text { + margin-top: 10px; + margin-bottom: 5px; +} +#event-submit { + margin-top: 10px; +} diff --git a/view/theme/redbasic/css/mod_group.php b/view/theme/redbasic/css/mod_group.php new file mode 100644 index 000000000..d1f48a84c --- /dev/null +++ b/view/theme/redbasic/css/mod_group.php @@ -0,0 +1,32 @@ +#group-members { + margin-top: 20px; + padding: 10px; + height: 250px; + overflow: auto; + border: 1px solid #ddd; +} + +#group-members-end { + clear: both; +} + +#group-separator { + margin-top: 10px; + margin-bottom: 10px; +} + +#group-all-contacts { + padding: 10px; + height: 450px; + overflow: auto; + border: 1px solid #ddd; +} + +#group-all-contacts-end { + clear: both; + margin-bottom: 10px; +} + +#group-edit-desc { + margin-top: 15px; +} diff --git a/view/theme/redbasic/css/mod_profile_photo.css b/view/theme/redbasic/css/mod_profile_photo.css new file mode 100644 index 000000000..beda7da4c --- /dev/null +++ b/view/theme/redbasic/css/mod_profile_photo.css @@ -0,0 +1,10 @@ + +#cropimage-wrapper, #cropimage-preview-wrapper { + float: left; + padding: 30px; +} + +#crop-image-form { + margin-top: 30px; + clear: both; +} diff --git a/view/theme/redbasic/css/mod_profiles.css b/view/theme/redbasic/css/mod_profiles.css new file mode 100644 index 000000000..b2b9a9d01 --- /dev/null +++ b/view/theme/redbasic/css/mod_profiles.css @@ -0,0 +1,39 @@ +#profile-edit-wrapper .field label { + margin-top: 20px; + width: 175px; +} + +#profile-edit-wrapper .field input[type="text"] { + margin-top: 20px; + width: 220px; +} + + +#profile-edit-links { + max-width: $converse_width; + padding-top: 15px; + padding-bottom: 15px; +} + +#profile-edit-links .btn { + margin: 0 10px 15px 0; +} + +.profile-import { + vertical-align: top; + text-align: left; +} + +.profile-import b { + color: $link_colour; +} + +.profile-import input { + color: $font_colour; + border: none; +} + +#profile-edit-drop-link { + color: #FFF; + font-weight: normal; +} diff --git a/view/theme/redbasic/css/mod_profperm.css b/view/theme/redbasic/css/mod_profperm.css new file mode 100644 index 000000000..dabd0ceaa --- /dev/null +++ b/view/theme/redbasic/css/mod_profperm.css @@ -0,0 +1,32 @@ +#prof-members { + margin-top: 20px; + padding: 10px; + height: 250px; + overflow: auto; + border: 1px solid #ddd; +} + +#prof-members-end { + clear: both; +} + +#prof-separator { + margin-top: 10px; + margin-bottom: 10px; +} + +#prof-all-contacts { + padding: 10px; + height: 450px; + overflow: auto; + border: 1px solid #ddd; +} + +#prof-all-contacts-end { + clear: both; + margin-bottom: 10px; +} + +#prof-edit-desc { + margin-top: 15px; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bd08ae4a4..50b21add9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -358,61 +358,11 @@ footer { margin-top: 10px; } - -#cropimage-wrapper, #cropimage-preview-wrapper { - float: left; - padding: 30px; -} - -#crop-image-form { - margin-top: 30px; - clear: both; -} - +// Not used anymore? #page-profile .title { font-weight: bold; } -#profile-edit-wrapper .field label { - margin-top: 20px; - width: 175px; -} - -#profile-edit-wrapper .field input[type="text"] { - margin-top: 20px; - width: 220px; -} - - -#profile-edit-links { - max-width: $converse_width; - padding-top: 15px; - padding-bottom: 15px; -} - -#profile-edit-links .btn { - margin: 0 10px 15px 0; -} - -.profile-import { - vertical-align: top; - text-align: left; -} - -.profile-import b { - color: $link_colour; -} - -.profile-import input { - color: $font_colour; - border: none; -} - -#profile-edit-drop-link { - color: #FFF; - font-weight: normal; -} - .fn { font-weight: bold; font-size: 16px; @@ -689,18 +639,6 @@ footer { overflow: hidden; } -#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { - color: #8888FF; - text-decoration: none; - cursor: pointer; -} - -#photos-upload-perms-menu:hover { - color: #0000FF; - text-decoration: underline; - cursor: pointer; -} - #photo-view-wrapper { background-color: $item_colour; } @@ -1056,15 +994,18 @@ footer { margin: 10px; } +/* Not used anymore? */ #identity-manage-desc { margin-top:15px; margin-bottom: 15px; } +/* Not used anymore? */ #identity-manage-choose { margin-bottom: 15px; } +/* Not used anymore? */ #identity-submit { margin-top: 20px; } @@ -1112,114 +1053,27 @@ footer { .side-link { margin-bottom: 15px; } - -#group-members { - margin-top: 20px; - padding: 10px; - height: 250px; - overflow: auto; - border: 1px solid #ddd; -} - -#group-members-end { - clear: both; -} - -#group-separator { - margin-top: 10px; - margin-bottom: 10px; -} - -#group-all-contacts { - padding: 10px; - height: 450px; - overflow: auto; - border: 1px solid #ddd; -} - -#group-all-contacts-end { - clear: both; - margin-bottom: 10px; -} - -#group-edit-desc { - margin-top: 15px; -} - - -#prof-members { - margin-top: 20px; - padding: 10px; - height: 250px; - overflow: auto; - border: 1px solid #ddd; -} - -#prof-members-end { - clear: both; -} - -#prof-separator { - margin-top: 10px; - margin-bottom: 10px; -} - -#prof-all-contacts { - padding: 10px; - height: 450px; - overflow: auto; - border: 1px solid #ddd; -} - -#prof-all-contacts-end { - clear: both; - margin-bottom: 10px; -} - -#prof-edit-desc { - margin-top: 15px; -} - - .required { color: #FF0000; } -#event-start-text, #event-finish-text { - margin-top: 10px; - margin-bottom: 5px; -} - -#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text { - float: left; -} -#event-datetime-break { - margin-bottom: 10px; -} - -#event-nofinish-break, #event-adjust-break { - clear: both; -} - -#event-desc-text, #event-location-text { - margin-top: 10px; - margin-bottom: 5px; -} -#event-submit { - margin-top: 10px; -} - +/* Not used anymore? */ #item-delete-selected { margin-top: 30px; } +/* Not used anymore? */ #item-delete-selected-end { clear: both; } + +/* Not used anymore? */ #item-delete-selected-icon, #item-delete-selected-desc { float: left; margin-right: 5px; } + +/* Not used anymore? */ #item-delete-selected-desc:hover { text-decoration: underline; } diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 70b42b6cd..adf2e632d 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -34,7 +34,7 @@ {{include file="field_input.tpl" field=$nav_min_opacity}} {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} -{{include file="field_checkbox.tpl" field=$sloppy_photos}} +{{*include file="field_checkbox.tpl" field=$sloppy_photos*}} <script> $(function(){ $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker(); diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index 2ab3edcc2..013b72d50 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -18,7 +18,6 @@ <li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li> <li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> <li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> - <li><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li> <li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> </ul> </div> diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 033ee40a7..82f2a7628 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -1,6 +1,10 @@ <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > + <input type="hidden" name="channelnick" value="{{$channelnick}}" /> + <input type="hidden" name="filehash" value="{{$file.hash}}" /> + <input type="hidden" name="uid" value="{{$uid}}" /> + <input type="hidden" name="fileid" value="{{$file.id}}" /> - <div id="attach-edit-tools" class="btn-group form-group"> + <div id="attach-edit-tools-share" class="btn-group form-group"> {{if !$isadir}} <a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs"> <i class="icon-paperclip jot-icons"></i> @@ -10,28 +14,25 @@ <i class="icon-share jot-icons"></i> </button> </div> - <div id="attach-edit-perms" class="btn-group form-group pull-right"> - <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> - </button> - <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit"> - {{$submit}} - </button> + <div id="attach-edit-tools-perms" class="form-group pull-right{{if $isadir}} btn-group{{/if}}"> + {{if $isadir}} + <div id="attach-edit-perms-recurse" class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-xs" title="{{$recurse}}"> + <input type="checkbox" autocomplete="off" name="recurse" value="1"><i class="icon-level-down jot-icons"></i> + </label> + </div> + {{/if}} + <div id="attach-edit-perms" class="btn-group"> + <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> + </button> + <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit"> + {{$submit}} + </button> + </div> </div> - {{$aclselect}} - <input type="hidden" name="channelnick" value="{{$channelnick}}" /> - <input type="hidden" name="filehash" value="{{$file.hash}}" /> - <input type="hidden" name="uid" value="{{$uid}}" /> - <input type="hidden" name="fileid" value="{{$file.id}}" /> - - {{if $isadir}} - <div class="form-group"> - <label id="attach-edit-recurse-text" class="checkbox-inline" for="attach-recurse-input" > - <input class="checkbox-inline" id="attach-recurse-input" type="checkbox" name="recurse" value="1" />{{$recurse}} - </label> - </div> - {{/if}} + {{$aclselect}} <div id="link-code" class="form-group"> <label for="">{{$cpldesc}}</label> diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index c151ba8b2..af80e7b4d 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,4 +1,4 @@ -<div class="channel-selection"> +<div class='channel-selection {{if $selected == $channel.channel_id}}selected-channel{{/if}}'> {{if $channel.default_links}} {{if $channel.default}} <div class="channel-selection-default default"><i class="icon-check"></i> {{$msg_default}}</div> @@ -10,5 +10,3 @@ <div class="channels-notifications-wrapper"><a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a> <a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a></div> <a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a> </div> - -<div class="channel-selection-end"></div> diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 0dec68a53..26d0e14d2 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -13,14 +13,6 @@ {{$channel_usage_message}} </div> {{/if}} -{{if $selected}} -<div id="selected-channel"> -<div id="channels-selected">{{$msg_selected}}</div> -{{include file="channel.tpl" channel=$selected}} -</div> -<div class="channels-end selected"></div> -{{/if}} -<br /> <div id="channels-desc" class="descriptive-text">{{$desc}}</div> <div id="all-channels"> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index d88bc94c4..da708a98c 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -2,16 +2,18 @@ <label for="files-mkdir">{{$folder_header}}</label> <form method="post" action=""> <input type="hidden" name="sabreAction" value="mkcol"> - <input id="files-mkdir" type="text" name="name"> - <input type="submit" value="{{$folder_submit}}"> + <input id="files-mkdir" type="text" name="name" class="form-control form-group"> + <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button> </form> + <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 id="files-upload" type="file" name="file" style="display: inline;"> - <input type="submit" value="{{$upload_submit}}"> + <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> + <div class="clear"></div> </div> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 10fc82648..6cd7e3eb9 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -18,30 +18,40 @@ {{$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"> - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> - </button> - <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> + <div class="pull-right btn-group form-group"> + <div class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-sm" title="{{$nosharetext}}"> + <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i> + </label> + </div> + <div class="btn-group"> + {{if $lockstate}} + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> + {{/if}} + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> + </div> + </div> {{/if}} - <div class="clear"></div> - <div class="checkbox"> - <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> - {{if $uploader}} - <div id="photos-upload-perms" class="pull-right"> + <div id="photos-upload-perms" class="btn-group pull-right"> + <div class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-sm" title="{{$nosharetext}}"> + <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i> + </label> + </div> + {{if $lockstate}} <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> </button> + {{/if}} <div class="pull-right"> {{$uploader}} </div> |