aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-04-16 20:28:23 -0700
committerfriendica <info@friendica.com>2014-04-16 20:28:23 -0700
commit9be4cd4dcdd7975404b7e0a9b71071517d37ec90 (patch)
tree744a924e4765b711e442649c5f6ca4d866694d5e
parentacc70b9deb36e7114d4738f6b29f4f780a45a1be (diff)
parentd26a433a5e7d2c1f71af0eed116f834ad4825101 (diff)
downloadvolse-hubzilla-9be4cd4dcdd7975404b7e0a9b71071517d37ec90.tar.gz
volse-hubzilla-9be4cd4dcdd7975404b7e0a9b71071517d37ec90.tar.bz2
volse-hubzilla-9be4cd4dcdd7975404b7e0a9b71071517d37ec90.zip
Lots of positional changes on sidebar menus - reduce indented margins
Merge branch 'master' into ruler Conflicts: view/css/widgets.css
-rw-r--r--doc/dav_mount.bb25
-rw-r--r--version.inc2
-rw-r--r--view/css/mod_connections.css5
-rw-r--r--view/css/widgets.css23
-rw-r--r--view/theme/redbasic/css/style.css131
-rw-r--r--view/theme/redbasic/php/style.php111
-rw-r--r--view/theme/redbasic/schema/dark.php100
-rwxr-xr-xview/tpl/connections.tpl2
-rwxr-xr-xview/tpl/follow.tpl3
-rwxr-xr-xview/tpl/peoplefind.tpl8
10 files changed, 351 insertions, 59 deletions
diff --git a/doc/dav_mount.bb b/doc/dav_mount.bb
index f86e2a6e5..85ca614f4 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 &lt;DesktopUser&gt;[/code]
+[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.
+
Edit /etc/fstab
[code]nano /etc/fstab[/code]
@@ -60,4 +64,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]
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
diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index 6fd666845..097027179 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -1,4 +1,9 @@
+.search-input {
+ padding: 4px 12px;
+ margin: 3px;
+}
+
.field_abook_help {
color: #000;
}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index c6ad647f7..d100ae3ec 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -55,6 +55,23 @@
overflow: hidden;
}
+/* peoplefind */
+
+#peoplefind-sidebar .btn {
+ margin: 10px 0 10px 0;
+}
+
+#side-peoplefind-url {
+ margin-top: 5px;
+}
+
+#side-peoplefind-url {
+ font-size: 1em;
+}
+
+
+/* fileas */
+
/* posted date */
@@ -121,3 +138,9 @@ li:hover .group-edit-icon {
margin-top: 10px;
margin-bottom: 45px;
}
+
+/* photo albums */
+
+#photo-albums-upload-link {
+ margin-top: 10px;
+} \ No newline at end of file
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 26bfdb656..a7d99efb1 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;
}
@@ -240,7 +240,16 @@ aside li {
/*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 {
@@ -642,25 +651,14 @@ aside li {
margin-top: 20px;
}
-#side-peoplefind-url {
- margin-top: 5px;
-}
-
-#side-peoplefind-url {
- font-size: 1em;
-}
-
-#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;
}
-#side-peoplefind-submit {
- margin-top: 15px;
-}
#side-match-link {
margin-top: 10px;
@@ -1401,23 +1399,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;
}
@@ -1541,11 +1545,12 @@ header {
}
.notif-item a {
- color: #000000;
+ color: $notif_itemcolour;
}
.notif-item a:hover {
text-decoration: underline;
+ color: $notif_itemhovercolour;
}
.notif-image {
@@ -1554,8 +1559,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 {
@@ -1898,14 +1922,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 {
@@ -2145,6 +2169,8 @@ blockquote {
border-radius: $radiuspx;
}
+
+
.dropdown-menu img {
border-radius: $radiuspx;
}
@@ -2216,6 +2242,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);
@@ -2263,4 +2331,5 @@ blockquote {
.acl-list-item {
width: calc(100% - 10px);
}
+
}
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,
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 @@
<?php
if (! $nav_bg)
- $nav_bg = "#000000";
+ $nav_bg = "#000";
if (! $nav_gradient_top)
- $nav_gradient_top = "#000000";
+ $nav_gradient_top = "#000";
if (! $nav_gradient_bottom)
- $nav_gradient_bottom = "#000000";
+ $nav_gradient_bottom = "#000";
if (! $nav_active_gradient_top)
- $nav_active_gradient_top = "#333333";
+ $nav_active_gradient_top = "#333";
if (! $nav_active_gradient_bottom)
- $nav_active_gradient_bottom = "#111111";
+ $nav_active_gradient_bottom = "#111";
if (! $nav_bd)
- $nav_bd = "#111111";
+ $nav_bd = "#111";
if (! $nav_icon_colour)
- $nav_icon_colour = "#999999";
+ $nav_icon_colour = "#999";
if (! $nav_active_icon_colour)
- $nav_active_icon_colour = "#ffffff";
+ $nav_active_icon_colour = "#fff";
+ if (! $navtabs_borderc)
+ $navtabs_borderc = "#333";
+ if (! $navtabs_fontcolour)
+ $navtabs_fontcolour = "#fff";
+ if (! $navtabs_bgcolour)
+ $navtabs_bgcolour = "#111";
+ if (! $navtabs_linkcolour)
+ $navtabs_linkcolour = "color: #ccc;";
+ if (! $navtabs_linkchover)
+ $navtabs_linkchover = "color: #fff;";
+ if (! $navtabs_bgchover)
+ $navtabs_bgchover = "#222";
+ if (! $navtabs_decohover)
+ $navtabs_decohover = "underline";
if (! $link_colour)
- $link_colour = "#ffffff";
+ $link_colour = "#fff";
+ if (! $selected_active_colour)
+ $selected_active_colour = "#fff";
+ if (! $selected_active_deco)
+ $selected_active_deco = "underline";
if (! $banner_colour)
- $banner_colour = "#999999";
+ $banner_colour = "#999";
if (! $search_background)
- $search_background = "#999999";
+ $search_background = "#999";
if (! $bgcolour)
- $bgcolour = "#111111";
+ $bgcolour = "#111";
if (! $item_colour)
- $item_colour = "#111111";
+ $item_colour = "#111";
if (! $toolicon_colour)
- $toolicon_colour = '#999999';
+ $toolicon_colour = '#999';
if (! $toolicon_activecolour)
- $toolicon_activecolour = '#ffffff';
+ $toolicon_activecolour = '#fff';
if (! $font_colour)
- $font_colour = "#cccccc";
+ $font_colour = "#ccc";
+ if (! $blockquote_colour)
+ $blockquote_colour = "#ccc";
+ if (! $blockquote_bgcolour)
+ $blockquote_bgcolour = "#1e1e1e";
+ if (! $blockquote_bordercolour)
+ $blockquote_bordercolour = "#666";
+ if (! $item_bordercolour)
+ $item_bordercolour = "#333";
+ if (! $notif_itemcolour)
+ $notif_itemcolour = "#ccc";
+ if (! $notif_itemhovercolour)
+ $notif_itemhovercolour = "#fff";
+ if (! $acpopup_bgcolour)
+ $acpopup_bgcolour = "#222";
+ if (! $acpopup_bordercolour)
+ $acpopup_bordercolour = "#333";
+ if (! $acpopup_tgbl_bgcolour)
+ $acpopup_tgbl_bgcolour = "#333";
+ if (! $acpopup_hovercolour)
+ $acpopup_hovercolour = "#fff";
+ if (! $editbuttons_bgcolour)
+ $editbuttons_bgcolour = "#1e1e1e";
+ if (! $editbuttons_bordercolour)
+ $editbuttons_bordercolour = "#222";
+ if (! $editbuttons_bghover)
+ $editbuttons_bghover = "#222";
+ if (! $notify_bgcolour)
+ $notify_bgcolour = "#000";
+ if (! $notify_linkcolour)
+ $notify_linkcolour = "#FFF";
+ if (! $notify_bghover)
+ $notify_bghover = "#222";
+ if (! $notifyseen_bgcolour)
+ $notifyseen_bgcolour = "#111";
+ if (! $notifyseen_linkcolour)
+ $notifyseen_linkcolour = "#222";
+ if (! $notifyseen_bghover)
+ $notifyseen_bghover = "#222";
+ if (! $notifyseen_linkhover)
+ $notifyseen_linkhover = "#CCC";
+ if (! $input_bgsubmit)
+ $input_bgsubmit = "#333";
+ if (! $input_linksubmit)
+ $input_linksubmit = "#fff";
+ if (! $input_border)
+ $input_border = "#222";
+ if (! $input_colourhover)
+ $input_colourhover = "#fff";
+ if (! $input_decohover)
+ $input_decohover = "underline";
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index f254ce8c2..c69dcde50 100755
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -6,7 +6,7 @@
<form id="contacts-search-form" action="{{$cmd}}" method="get" >
<span class="contacts-search-desc">{{$desc}}</span>
<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
-<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
+<input type="submit" name="submit" id="contacts-search-submit" class="btn btn-default" value="{{$submit}}" />
</form>
</div>
<div id="contacts-search-end"></div>
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index b0597e9b6..f643a3597 100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -2,7 +2,8 @@
<h3>{{$connect}}</h3>
<div id="connect-desc">{{$desc}}</div>
<form action="follow" method="post" />
- <input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
+ <input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" />
+ <input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" />
</form>
{{if $abook_usage_message}}
<div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div>
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index c1462a9e9..55bf1575f 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -1,15 +1,15 @@
<div id="peoplefind-sidebar" class="widget">
<h3>{{$findpeople}}</h3>
- {{$desc}}
+ <div class="descriptive-text">{{$desc}}</div>
<form action="directory" method="post" />
<input class="icon-search" id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" placeholder="&#xf002;"/>
- <input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" />
+ <input id="side-peoplefind-submit" class="btn btn-default" type="submit" name="submit" value="{{$findthem}}" />
<br />
{{if $advanced_search}}
<a href="#" onclick="openClose('advanced-people-search-div'); return false;">{{$advanced_search}}</a>
<div id="advanced-people-search-div" style="display: none;">
- <input class="icon-search" id="side-peoplefind-url" type="text" name="query" size="24" title="{{$advanced_hint}}" placeholder="&#xf002;"/>
- <input id="side-peoplefind-submit" type="submit" name="submit" value="{{$find_advanced}}" />
+ <input class="icon-search" id="side-advanced-peoplefind-url" type="text" name="query" size="24" title="{{$advanced_hint}}" placeholder="&#xf002;"/>
+ <input id="side-advanced-peoplefind-submit" class="btn btn-default" type="submit" name="submit" value="{{$find_advanced}}" />
</div>
<br />
{{/if}}