From bef2d264842bf05e8b77d35dc3cb815d45ef3344 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Tue, 15 Apr 2014 21:29:03 +0200 Subject: [PATCH 1/9] Large update dark schema The new ACL and some minor things still needs to be done. Style.css and style.php will follow. --- view/theme/redbasic/schema/dark.php | 100 +++++++++++++++++++++++----- 1 file changed, 84 insertions(+), 16 deletions(-) diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 24ed4f418..27fbd26fc 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -1,34 +1,102 @@ Date: Tue, 15 Apr 2014 21:33:26 +0200 Subject: [PATCH 2/9] Needed for large update dark schema. --- view/theme/redbasic/php/style.php | 111 ++++++++++++++++++++++++++++-- 1 file changed, 107 insertions(+), 4 deletions(-) diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 49852036b..8984df788 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -87,8 +87,22 @@ if(! $a->install) { $nav_icon_colour = "#999"; if (! $nav_active_icon_colour) $nav_active_icon_colour = "#fff"; + if (! $navtabs_borderc) + $navtabs_borderc = "#ddd"; + if (! $navtabs_fontcolour) + $navtabs_fontcolour = "#555"; + if (! $navtabs_bgcolour) + $navtabs_bgcolour = "#fff"; + if (! $navtabs_linkcolour) + $navtabs_linkcolour = ""; + if (! $navtabs_linkchover) + $navtabs_linkchover = ""; + if (! $navtabs_decohover) + $navtabs_decohover = "none"; + if (! $navtabs_bgchover) + $navtabs_bgchover = "#eee"; if (! $link_colour) - $link_colour = "#0080FF"; + $link_colour = "#0080ff"; if (! $banner_colour) $banner_colour = "#fff"; if (! $search_background) @@ -100,23 +114,77 @@ if(! $a->install) { if (! $item_colour) $item_colour = "#fdfdfd"; if (! $toolicon_colour) - $toolicon_colour = '#777777'; + $toolicon_colour = '#777'; if (! $toolicon_activecolour) $toolicon_activecolour = '#000'; if (! $item_opacity) $item_opacity = "1"; + if (! $item_bordercolour) + $item_bordercolour = "#f4f4f4"; if (! $font_size) $font_size = "1.0em"; if (! $body_font_size) $body_font_size = "11px"; if (! $font_colour) - $font_colour = "#4D4D4D"; + $font_colour = "#4d4d4d"; + if (! $selected_active_colour) + $selected_active_colour = "#444"; + if (! $selected_active_deco) + $selected_active_deco = "none"; + if (! $blockquote_colour) + $blockquote_colour = "#000"; + if (! $blockquote_bgcolour) + $blockquote_bgcolour = "#f4f8f9"; + if (! $blockquote_bordercolour) + $blockquote_bordercolour = "#dae4ee"; + if (! $notif_itemcolour) + $notif_itemcolour = "#000"; + if (! $notif_itemhovercolour) + $notif_itemhovercolour = "#000"; + if (! $editbuttons_bgcolour) + $editbuttons_bgcolour = "#fff"; + if (! $editbuttons_bordercolour) + $editbuttons_bordercolour = "#ccc"; + if (! $editbuttons_bghover) + $editbuttons_bghover = "#ebebeb"; + if (! $acpopup_bgcolour) + $acpopup_bgcolour = "#fff"; + if (! $acpopup_bordercolour) + $acpopup_bordercolour = "#ccc"; + if (! $acpopup_tgbl_bgcolour) + $acpopup_tgbl_bgcolour = "#ddddff"; + if (! $acpopup_hovercolour) + $acpopup_hovercolour = "#000"; + if (! $notify_bgcolour) + $notify_bgcolour = "#fff"; + if (! $notify_linkcolour) + $notify_linkcolour = "#333"; + if (! $notify_bghover) + $notify_bghover = "#e7e7e7"; + if (! $notifyseen_bgcolour) + $notifyseen_bgcolour = "#ddd"; + if (! $notifyseen_linkcolour) + $notifyseen_linkcolour = "#333"; + if (! $notifyseen_bghover) + $notifyseen_bghover = "#e7e7e7"; + if (! $notifyseen_linkhover) + $notifyseen_linkhover = "#333"; + if (! $input_bgsubmit) + $input_bgsubmit = "#F0F0F0"; + if (! $input_linksubmit) + $input_linksubmit = "#0080FF"; + if (! $input_border) + $input_border = "#666"; + if (! $input_colourhover) + $input_colourhover = "#333"; + if (! $input_decohover) + $input_decohover = "none"; if (! $radius) $radius = "0"; if (! $shadow) $shadow = "0"; if(! $active_colour) - $active_colour = '#FFFFFF'; + $active_colour = '#fff'; if (! $converse_width) { $converse_width="1024px"; } @@ -154,6 +222,13 @@ $options = array ( '$nav_bd' => $nav_bd, '$nav_icon_colour' => $nav_icon_colour, '$nav_active_icon_colour' => $nav_active_icon_colour, +'$navtabs_borderc' => $navtabs_borderc, +'$navtabs_fontcolour' => $navtabs_fontcolour, +'$navtabs_bgcolour' => $navtabs_bgcolour, +'$navtabs_linkcolour' => $navtabs_linkcolour, +'$navtabs_linkchover' => $navtabs_linkchover, +'$navtabs_bgchover' => $navtabs_bgchover, +'$navtabs_decohover' => $navtabs_decohover, '$link_colour' => $link_colour, '$banner_colour' => $banner_colour, '$search_background' => $search_background, @@ -161,11 +236,39 @@ $options = array ( '$background_image' => $background_image, '$item_colour' => $item_colour, '$item_opacity' => $item_opacity, +'$item_bordercolour' => $item_bordercolour, '$toolicon_colour' => $toolicon_colour, '$toolicon_activecolour' => $toolicon_activecolour, '$font_size' => $font_size, '$font_colour' => $font_colour, +'$selected_active_colour' => $selected_active_colour, +'$selected_active_deco' => $selected_active_deco, '$body_font_size' => $body_font_size, +'$blockquote_colour' => $blockquote_colour, +'$blockquote_bgcolour' => $blockquote_bgcolour, +'$blockquote_bordercolour' => $blockquote_bordercolour, +'$blockquote_bgcolourhover' => $blockquote_bgcolourhover, +'$notif_itemcolour' => $notif_itemcolour, +'$notif_itemhovercolour' => $notif_itemhovercolour, +'$editbuttons_bgcolour' => $editbuttons_bgcolour, +'$editbuttons_bordercolour' => $editbuttons_bordercolour, +'$editbuttons_bghover' => $editbuttons_bghover, +'$acpopup_bgcolour' => $acpopup_bgcolour, +'$acpopup_bordercolour' => $acpopup_bordercolour, +'$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour, +'$acpopup_hovercolour' => $acpopup_hovercolour, +'$notify_bgcolour' => $notify_bgcolour, +'$notify_linkcolour' => $notify_linkcolour, +'$notify_bghover' => $notify_bghover, +'$notifyseen_bgcolour' => $notifyseen_bgcolour, +'$notifyseen_linkcolour' => $notifyseen_linkcolour, +'$notifyseen_bghover' => $notifyseen_bghover, +'$notifyseen_linkhover' => $notifyseen_linkhover, +'$input_bgsubmit' => $input_bgsubmit, +'$input_linksubmit' => $input_linksubmit, +'$input_border' => $input_border, +'$input_colourhover' => $input_colourhover, +'$input_decohover' => $input_decohover, '$radius' => $radius, '$shadow' => $shadow, '$active_colour' => $active_colour, From 16db3934958f7fa2f8768ed631121bab518c84f4 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Tue, 15 Apr 2014 21:35:30 +0200 Subject: [PATCH 3/9] Needed for large update dark schema and minor fixes default. --- view/theme/redbasic/css/style.css | 116 +++++++++++++++++++++++++----- 1 file changed, 98 insertions(+), 18 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f1bfbd711..8d91e0169 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -66,16 +66,16 @@ textarea { } input { - border: 1px solid #666666; + border: 1px solid $input_border; -moz-border-radius: $radiuspx; border-radius: $radiuspx; padding: 3px; } input[type="submit"] { - background-color: #F0F0F0; + background-color: $input_bgsubmit; font-weight: bold; - color: #0080FF; + color: $input_linksubmit; text-decoration: none; } @@ -101,10 +101,10 @@ code { } blockquote { - background-color: #f4f8f9; - border-left: 4px solid #dae4ee; + background-color: $blockquote_bgcolour; + border-left: 4px solid $blockquote_bordercolour; padding: 0.4em; - color: #000; + color: $blockquote_colour; margin-left: 20px; } @@ -230,7 +230,16 @@ footer { /*TODO: we should use one class for all this. */ .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { - color: #444444 !important; + color: $selected_active_colour !important; + text-decoration: $selected_active_deco !important; +} + +.fileas-all { + text-decoration: none !important; +} + +.fileas-all:hover { + text-decoration: underline !important; } #sysmsg { @@ -1391,23 +1400,29 @@ brain is weird like that */ /* autocomplete popup */ .acpopup { max-height:150px; - background-color:#ffffff; + background-color:$acpopup_bgcolour; overflow:auto; z-index:100000; - border:1px solid #cccccc; + border:1px solid $acpopup_bordercolour; } .acpopupitem { - background-color:#ffffff; padding: 4px; + background-color:$acpopup_bgcolour; padding: 4px; clear:left; } .acpopupitem.taggable { - background-color: #ddddff; + background-color: $acpopup_tgbl_bgcolour; } .acpopupitem img { float: left; margin-right: 4px; } +.acpopupitem:hover { + text-decoration: underline; + color: $acpopup_hovercolour; + cursor:pointer; +} + .acpopupitem.selected { color: #FFFFFF; background: #3465A4; } @@ -1531,11 +1546,12 @@ header { } .notif-item a { - color: #000000; + color: $notif_itemcolour; } .notif-item a:hover { text-decoration: underline; + color: $notif_itemhovercolour; } .notif-image { @@ -1544,8 +1560,27 @@ header { padding: 7px 7px 0px 0px; } -.notify-seen { - background: #DDDDDD; + +#nav-notify-menu { + background: $notify_bgcolour; +} + +#nav-notify-menu a { + color: $notify_linkcolour; +} + +#nav-notify-menu a:hover { + background: $notify_bghover; +} + +.notify-seen a { + background: $notifyseen_bgcolour; + color: $notifyseen_linkcolour !important; +} + +.notify-seen a:hover { + background: $notifyseen_bghover; + color: $notifyseen_linkhover !important; } #page-spinner { @@ -1892,14 +1927,14 @@ img.mail-list-sender-photo { border-radius: $radiuspx; background-color: $item_colour; opacity: $item_opacity; - border-left: 2px solid #f4f4f4; - border-bottom: 1px solid #f4f4f4; + border-left: 2px solid $item_bordercolour; + border-bottom: 1px solid $item_bordercolour; } .wall-item-comment-wrapper { margin-top: 10px; - border-left: 2px solid #f4f4f4; - border-bottom: 1px solid #f4f4f4; + border-left: 2px solid $item_bordercolour; + border-bottom: 1px solid $item_bordercolour; } .wallwall .wwto { @@ -2138,6 +2173,8 @@ blockquote { border-radius: $radiuspx; } + + .dropdown-menu img { border-radius: $radiuspx; } @@ -2209,6 +2246,48 @@ blockquote { box-shadow: none; } +.nav-tabs{ + border-bottom:1px solid $navtabs_borderc !important; +} + +.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{ + color: $navtabs_fontcolour !important; + background-color: $navtabs_bgcolour; +} + +.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ + border:1px solid $navtabs_borderc !important; + border-bottom:1px solid transparent !important; + bottom: -1px !important; +} + +.nav-tabs.nav-justified > li > a { + border-bottom: none; + $navtabs_linkcolour +} + +.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { + text-decoration: $navtabs_decohover; + background-color: $navtabs_bgchover; + border-bottom: 1px solid $navtabs_bgchover; + border-color: $navtabs_bgchover; + $navtabs_linkchover +} + +.btn-default { + background-color: $editbuttons_bgcolour; + border-color: $editbuttons_bordercolour; + text-shadow: none; + box-shadow: none; +} + +.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { + background-color: $editbuttons_bghover; + border-color: $editbuttons_bordercolour; + color: $input_colourhover; + text-decoration: $input_decohover; +} + @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); @@ -2256,4 +2335,5 @@ blockquote { .acl-list-item { width: calc(100% - 10px); } + } From 9589d12c936a7a8958caf7192d0eb6d84174a6f7 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 16 Apr 2014 18:50:48 +0100 Subject: [PATCH 4/9] Doco - Add some troubleshooting for 0 byte files in Davfs2 --- doc/dav_mount.bb | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/doc/dav_mount.bb b/doc/dav_mount.bb index f86e2a6e5..977d4d531 100644 --- a/doc/dav_mount.bb +++ b/doc/dav_mount.bb @@ -60,4 +60,23 @@ Finally, mount the drive. You can now find your cloud at /home/bob/cloud and use it as though it were part of your local filesystem - even if the applications you are using have no dav support themselves. -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] \ No newline at end of file +[b]Troubleshooting[/b] + +With some webservers and certain configurations, you may find davfs2 creating files with 0 bytes file size where other clients work just fine. This is generally caused by cache and locks. If you are affected by this issue, you need to edit your davfs2 configuration. + +[code]nano /etc/davfs2/davfs2.conf[/code] + +Your distribution will provide a sample configuration, and this file should already exist, however, most of it will be commented out with a # at the beginning of the line. + +First step is to remove locks. + +Edit the use_locks line so it reads [code]use_locks 0[/code]. + +Unmount your file system, remount your file system, and try copying over a file from the command line. Note you should copy a new file, and not overwrite an old one for this test. Leave it a minute or two then do [code]ls -l -h[/code] and check the file size of your new file is still greater than 0 bytes. If it is, stop there, and do nothing else. + +If that still doesn't work, disable the cache. Note that this has a performance impact so should only be done if disabling locks didn't solve your problem. Edit the cache_size and set it to [code]cache_size 0[/code] and also set file_refresh to [code]file_refresh 0[/code]. Unmount your filesystem, remount your file system, and test it again. + +If it [i]still[/i] doesn't work, there is one more thing you can try. (This one is caused by a bug in older versions of dav2fs itself, so updating to a new version may also help). Enable weak etag dropping by setting [code]drop_weak_etags 1[/code]. Unmount and remount your filesystem to apply the changes. + + +Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] From 2d86c7317c2f80a0f9ae488b254511478dc0927a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 16:42:27 -0700 Subject: [PATCH 5/9] rev update --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index 63797b7eb..bd0e744d9 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-04-15.647 +2014-04-16.648 From 51d7be6f24900318ca92c594f12e5c5dcc2303b6 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 16 Apr 2014 17:12:49 -0700 Subject: [PATCH 6/9] added "network" as another user group for davfs --- doc/dav_mount.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/dav_mount.bb b/doc/dav_mount.bb index 977d4d531..6e52d49b0 100644 --- a/doc/dav_mount.bb +++ b/doc/dav_mount.bb @@ -14,6 +14,10 @@ Now you need to add any user you want to be able to mount dav to the davfs2 grou [code]usermod -aG davfs2 <DesktopUser>[/code] +[b]Note: on some systems the user group may be different, i.e. - "network" +on Arch Linux. If in doubt, check the davfs documentation for your +particular OS. + Edit /etc/fstab [code]nano /etc/fstab[/code] From 3a96691e293aca56992040e7a33dd05b4af17c2d Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 17 Apr 2014 01:19:58 +0100 Subject: [PATCH 7/9] Doc - missing closing tag --- doc/dav_mount.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/dav_mount.bb b/doc/dav_mount.bb index 6e52d49b0..85ca614f4 100644 --- a/doc/dav_mount.bb +++ b/doc/dav_mount.bb @@ -14,7 +14,7 @@ Now you need to add any user you want to be able to mount dav to the davfs2 grou [code]usermod -aG davfs2 <DesktopUser>[/code] -[b]Note: on some systems the user group may be different, i.e. - "network" +[b]Note:[/b] on some systems the user group may be different, i.e. - "network" on Arch Linux. If in doubt, check the davfs documentation for your particular OS. From 558e283260f097c2a85ddc8e7bb907d878d046a1 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 18:28:36 -0700 Subject: [PATCH 8/9] button cleanup directory page --- view/css/widgets.css | 15 +++++++++++++++ view/theme/redbasic/css/style.css | 11 ----------- view/tpl/peoplefind.tpl | 6 +++--- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/view/css/widgets.css b/view/css/widgets.css index 7c2a03c3b..a3263c64f 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -49,6 +49,21 @@ margin-left: 10px; } +/* peoplefind */ + +#peoplefind-sidebar .btn { + margin: 10px 0 10px 0; +} + +#side-peoplefind-url { + margin-top: 5px; +} + +#side-peoplefind-url { + font-size: 1em; +} + + /* fileas */ .fileas-ul li { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f1bfbd711..a03a1f2e3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -632,14 +632,6 @@ footer { margin-top: 20px; } -#side-peoplefind-url { - margin-top: 5px; -} - -#side-peoplefind-url { - font-size: 1em; -} - #side-peoplefind-url::-webkit-input-placeholder { font-family: FontAwesome; } @@ -648,9 +640,6 @@ footer { font-family: FontAwesome; } -#side-peoplefind-submit { - margin-top: 15px; -} #side-match-link { margin-top: 10px; diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index c1462a9e9..5f3dfac8f 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -3,13 +3,13 @@ {{$desc}}
- +
{{if $advanced_search}} {{$advanced_search}}
{{/if}} From c7712d3b45289552ce460f4802ccf934a380c69d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 16 Apr 2014 18:35:37 -0700 Subject: [PATCH 9/9] bug fixes after widget cleanup --- view/theme/redbasic/css/style.css | 4 ++-- view/tpl/peoplefind.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a03a1f2e3..0f58b3194 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -632,11 +632,11 @@ footer { margin-top: 20px; } -#side-peoplefind-url::-webkit-input-placeholder { +#side-peoplefind-url::-webkit-input-placeholder, #side-advanced-peoplefind-url::-webkit-input-placeholder { font-family: FontAwesome; } -#side-peoplefind-url::-moz-placeholder { +#side-peoplefind-url::-moz-placeholder, #side-advanced-peoplefind-url::-moz-placeholder { font-family: FontAwesome; } diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 5f3dfac8f..55bf1575f 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,6 +1,6 @@

{{$findpeople}}

- {{$desc}} +
{{$desc}}