aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css4
-rw-r--r--view/css/mod_message.css10
-rw-r--r--view/css/mod_photos.css4
-rw-r--r--view/css/widgets.css34
-rw-r--r--view/js/main.js5
-rw-r--r--view/theme/redbasic/css/style.css27
-rw-r--r--view/theme/redbasic/php/style.php6
-rw-r--r--view/theme/redbasic/php/theme_init.php2
-rw-r--r--view/theme/redbasic/schema/dark.php4
-rw-r--r--view/theme/redbasic/schema/simple_black_on_white.php4
-rw-r--r--view/theme/redbasic/schema/simple_green_on_black.php4
-rw-r--r--view/theme/redbasic/schema/simple_white_on_black.php4
-rwxr-xr-xview/tpl/admin_aside.tpl36
-rwxr-xr-xview/tpl/categories_widget.tpl6
-rwxr-xr-xview/tpl/event_form.tpl4
-rwxr-xr-xview/tpl/fileas_widget.tpl6
-rwxr-xr-xview/tpl/generic_links_widget.tpl4
-rwxr-xr-xview/tpl/group_side.tpl42
-rwxr-xr-xview/tpl/jot.tpl2
-rwxr-xr-xview/tpl/message_side.tpl17
-rwxr-xr-xview/tpl/photos_upload.tpl8
-rwxr-xr-xview/tpl/posted_date_widget.tpl30
22 files changed, 132 insertions, 131 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 7b0d87030..9cde6052f 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -93,6 +93,10 @@
float: left;
}
+a.wall-item-name-link {
+ font-weight: bold;
+}
+
.wall-item-author {
white-space: nowrap;
overflow: hidden;
diff --git a/view/css/mod_message.css b/view/css/mod_message.css
index 4290025a5..011c3edd5 100644
--- a/view/css/mod_message.css
+++ b/view/css/mod_message.css
@@ -1,13 +1,3 @@
-/* message side */
-
-#message-check {
- text-align: left;
- white-space: normal;
- margin-top: 48px;
- margin-bottom: 15px;
-}
-
-
/* message */
#mail-list-wrapper {
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index 0c4c25bae..5f8ed6124 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -135,7 +135,7 @@
margin-left: 200px;
}
-div[id^='photo-album-contents-'] {
- margin-bottom: 3px;
+#photos-usage-message {
+ line-height: 22px;
}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 96b4c1d60..cba246f06 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -1,14 +1,9 @@
-
-/* Easiest way to indent the widget body - indent the entire widget and then shift the header label back to the left */
-
.widget {
- word-wrap: break-word;
margin-bottom: 10px;
- padding: 10px 10px 10px 20px;
+ padding: 10px;
}
.widget h3 {
- margin-left: -10px;
margin-top: 0px;
}
@@ -36,13 +31,8 @@
height: 150px;
}
-#note-save {
- margin-top: 10px;
-}
-
/* saved searches */
-
#netsearch-box #search-submit {
margin: 10px 0 7px 0;
}
@@ -100,31 +90,14 @@
margin-left: 10px;
}
-#datebrowse-sidebar select {
- width: 190px;
- max-width: 190px;
- max-height: 150px;
-}
-
/* categories */
/* group */
-#sidebar-group-list {
- margin-bottom: 10px;
-}
-
-.sidebar-group-li input {
- float: right;
-}
-
-.groupsideedit {
- float: right;
-}
-
.group-edit-icon {
opacity: 0;
+ z-index: 1;
}
li:hover .group-edit-icon {
@@ -145,9 +118,6 @@ li:hover .group-edit-icon {
/* photo albums */
-#photo-albums-upload-link {
- margin-top: 10px;
-}
/* Chatrooms */
diff --git a/view/js/main.js b/view/js/main.js
index cf3749441..0560bc875 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -898,7 +898,10 @@ function updateConvItems(mode,data) {
"impel",
{ "element" : elem }
);
- return false;
+ if(timer) clearTimeout(timer);
+ timer = setTimeout(NavUpdate,10);
+
+ return true;
}
function preview_post() {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7df70e714..7bf8d77bf 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -62,7 +62,7 @@ abbr {
}
a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
- font-weight: bold;
+ font-weight: $link_font_weight;
color: $link_colour;
text-decoration: none;
}
@@ -75,12 +75,10 @@ a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; }
a.btn-default {
color: #333;
- font-weight: normal;
}
a.btn-success {
color: #fff;
- font-weight: normal;
}
input[type="text"],
@@ -444,7 +442,6 @@ aside li {
margin-bottom: 15px;
}
-
.fn {
font-weight: bold;
font-size: 16px;
@@ -461,11 +458,6 @@ aside li {
border-radius: $radiuspx;
}
-.vcard .title {
- margin-bottom: 10px;
-
-}
-
.vcard dl {
margin-top: 10px;
margin-bottom: 0px;
@@ -530,6 +522,11 @@ aside li {
height: 197px;
}
+#profile-photo-wrapper {
+ margin-top: 10px;
+}
+
+
#profile-in-dir-yes-label,
#profile-in-dir-no-label,
#profile-in-netdir-yes-label,
@@ -2142,7 +2139,7 @@ img.mail-list-sender-photo {
border-bottom-right-radius: $radiuspx;
border-bottom-left-radius: $radiuspx;
text-align: center;
- font-weight: bold;
+ font-size: $body_font_size;
color: $link_colour;
cursor: pointer;
}
@@ -2314,6 +2311,11 @@ blockquote {
$dropdown_bgimghover
}
+aside .nav > li > a:hover, aside .nav > li > a:focus {
+ text-decoration: $navtabs_decohover;
+ background-color: $navaside_bghover;
+}
+
.dropdown-menu img {
border-radius: $radiuspx;
}
@@ -2528,3 +2530,8 @@ blockquote {
}
}
+
+.shareable_element_text {
+ height: 300px;
+ width: 300px;
+}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index edf77cb0b..01ca5a7b9 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -109,6 +109,10 @@ if(! $a->install) {
$navtabs_bgchover = "rgba(238,238,238,0.8)";
if (! $link_colour)
$link_colour = "#428BCA";
+ if (! $navaside_bghover)
+ $navaside_bghover = "#eee";
+ if (! $link_font_weight)
+ $link_font_weight = "normal";
if (! $banner_colour)
$banner_colour = "#fff";
if (! $search_background)
@@ -320,7 +324,9 @@ $options = array (
'$navtabs_linkchover' => $navtabs_linkchover,
'$navtabs_bgchover' => $navtabs_bgchover,
'$navtabs_decohover' => $navtabs_decohover,
+'$navaside_bghover' => $navaside_bghover,
'$link_colour' => $link_colour,
+'$link_font_weight' => $link_font_weight,
'$banner_colour' => $banner_colour,
'$search_background' => $search_background,
'$bgcolour' => $bgcolour,
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 2da04a389..2fbca2ef0 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -11,7 +11,7 @@ require_once('view/php/theme_init.php');
head_add_js('library/bootstrap/js/bootstrap.min.js');
head_add_js('library/bootstrap/js/bootbox.min.js');
-head_add_js('library/bootstrap-datetimepicker/js/moment.js');
+head_add_js('library/bootstrap-datetimepicker/js/moment.min.js');
head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
//head_add_js('library/colorpicker/js/colorpicker.js');
head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index 27648f9fa..96600f9f6 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -34,8 +34,12 @@
$navtabs_bgchover = "#222";
if (! $navtabs_decohover)
$navtabs_decohover = "underline";
+ if (! $navaside_bghover)
+ $navaside_bghover = "#222";
if (! $link_colour)
$link_colour = "#fff";
+ if (! $link_font_weight)
+ $link_font_weight = "bold";
if (! $selected_active_colour)
$selected_active_colour = "#fff";
if (! $selected_active_deco)
diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php
index cdd85a129..42a62c5ba 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.php
+++ b/view/theme/redbasic/schema/simple_black_on_white.php
@@ -34,8 +34,12 @@
$navtabs_bgchover = "#fff";
if (! $navtabs_decohover)
$navtabs_decohover = "underline";
+if (! $navaside_bghover)
+ $navaside_bghover = "#F5F5F5";
if (! $link_colour)
$link_colour = "#000";
+ if (! $link_font_weight)
+ $link_font_weight = "bold";
if (! $selected_active_colour)
$selected_active_colour = "#000";
if (! $selected_active_deco)
diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php
index 3a1ea9134..641a46668 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.php
+++ b/view/theme/redbasic/schema/simple_green_on_black.php
@@ -34,8 +34,12 @@
$navtabs_bgchover = "#000";
if (! $navtabs_decohover)
$navtabs_decohover = "underline";
+if (! $navaside_bghover)
+ $navaside_bghover = "#143D12";
if (! $link_colour)
$link_colour = "#50f148";
+ if (! $link_font_weight)
+ $link_font_weight = "bold";
if (! $selected_active_colour)
$selected_active_colour = "#50f148";
if (! $selected_active_deco)
diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php
index 74d133038..50379dfe4 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.php
+++ b/view/theme/redbasic/schema/simple_white_on_black.php
@@ -34,8 +34,12 @@
$navtabs_bgchover = "#000";
if (! $navtabs_decohover)
$navtabs_decohover = "underline";
+ if (! $navaside_bghover)
+ $navaside_bghover = "#030303";
if (! $link_colour)
$link_colour = "#fff";
+ if (! $link_font_weight)
+ $link_font_weight = "bold";
if (! $selected_active_colour)
$selected_active_colour = "#fff";
if (! $selected_active_deco)
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
index cb3827bf2..b1838ece1 100755
--- a/view/tpl/admin_aside.tpl
+++ b/view/tpl/admin_aside.tpl
@@ -10,35 +10,35 @@
});
});
</script>
-<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
-<ul class='admin linklist'>
- <li class='admin link button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
- <li class='admin link button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
- <li class='admin link button {{$admin.channels.2}}'><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li>
- <li class='admin link button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
- <li class='admin link button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
- <li class='admin link button {{$admin.hubloc.2}}'><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li>
- <li class='admin link button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
+<h3>{{$admtxt}}</h3>
+<ul class="nav nav-pills nav-stacked">
+ <li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
+ <li><a href='{{$admin.users.0}}'>{{$admin.users.1}}<span id='pending-update' title='{{$h_pending}}'></span></a></li>
+ <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>
{{if $admin.update}}
-<ul class='admin linklist'>
- <li class='admin link button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
- <li class='admin link button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+<ul class="nav nav-pills nav-stacked">
+ <li><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+ <li><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
</ul>
{{/if}}
-{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
-<ul class='admin linklist'>
+{{if $admin.plugins_admin}}<h3>{{$plugadmtxt}}</h3>{{/if}}
+<ul class="nav nav-pills nav-stacked">
{{foreach $admin.plugins_admin as $l}}
- <li class='admin link button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
+ <li><a href='{{$l.0}}'>{{$l.1}}</a></li>
{{/foreach}}
</ul>
-<h4>{{$logtxt}}</h4>
-<ul class='admin linklist'>
- <li class='admin link button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
+<h3>{{$logtxt}}</h3>
+<ul class="nav nav-pills nav-stacked">
+ <li><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
</ul>
diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl
index 2c0b3bcc2..ea6d28dfc 100755
--- a/view/tpl/categories_widget.tpl
+++ b/view/tpl/categories_widget.tpl
@@ -2,10 +2,10 @@
<h3>{{$title}}</h3>
<div id="categories-sidebar-desc">{{$desc}}</div>
- <ul class="categories-ul">
- <li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>
+ <ul class="nav nav-pills nav-stacked">
+ <li><a href="{{$base}}"{{if $sel_all}} class="categories-selected"{{/if}}>{{$all}}</a></li>
{{foreach $terms as $term}}
- <li class="tool"><a href="{{$base}}?f=&cat={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
+ <li><a href="{{$base}}?f=&cat={{$term.name}}"{{if $term.selected}} class="categories-selected"{{/if}}>{{$term.name}}</a></li>
{{/foreach}}
</ul>
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index af10e6c73..b2455e26c 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -84,7 +84,7 @@
<span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> -->
<span class="icon-calendar"></span>
</span>
- <input id="start-date" value='{{$stext}}' type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/>
+ <input id="start-date" value='{{$stext}}' type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/>
</div>
</div>
<!-- </div> -->
@@ -123,7 +123,7 @@
<span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> -->
<span class="icon-calendar"></span>
</span>
- <input id="finish-date" value='{{$ftext}}' type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/>
+ <input id="finish-date" value='{{$ftext}}' type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/>
</div>
</div>
<!-- </div> -->
diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl
index 70d68c56e..a92440cb0 100755
--- a/view/tpl/fileas_widget.tpl
+++ b/view/tpl/fileas_widget.tpl
@@ -2,10 +2,10 @@
<h3>{{$title}}</h3>
<div id="nets-desc">{{$desc}}</div>
- <ul class="fileas-ul">
- <li class="tool"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li>
+ <ul class="nav nav-pills nav-stacked">
+ <li><a href="{{$base}}"{{if $sel_all}} class="fileas-selected"{{/if}}>{{$all}}</a></li>
{{foreach $terms as $term}}
- <li class="tool"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link{{if $term.selected}} fileas-selected{{/if}}">{{$term.name}}</a></li>
+ <li><a href="{{$base}}?f=&file={{$term.name}}"{{if $term.selected}} class="fileas-selected"{{/if}}>{{$term.name}}</a></li>
{{/foreach}}
</ul>
diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl
index 5ae52aa8a..d7c234a84 100755
--- a/view/tpl/generic_links_widget.tpl
+++ b/view/tpl/generic_links_widget.tpl
@@ -2,9 +2,9 @@
{{if $title}}<h3>{{$title}}</h3>{{/if}}
{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
- <ul>
+ <ul class="nav nav-pills nav-stacked">
{{foreach $items as $item}}
- <li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li>
+ <li><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li>
{{/foreach}}
</ul>
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index 8680a3db0..9037e0871 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -1,31 +1,27 @@
<div class="widget" id="group-sidebar">
-<h3>{{$title}}</h3>
-
-
-<div id="sidebar-group-list">
- <ul id="sidebar-group-ul">
- {{foreach $groups as $group}}
- <li class="sidebar-group-li">
+ <h3>{{$title}}</h3>
+ <div>
+ <ul class="nav nav-pills nav-stacked">
+ {{foreach $groups as $group}}
+ <li>
{{if $group.cid}}
- <input type="checkbox"
- class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action"
- onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}');return true;"
- {{if $group.ismember}}checked="checked"{{/if}}
- />
- {{/if}}
+ <input type="checkbox"
+ class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action"
+ onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}');return true;"
+ {{if $group.ismember}}checked="checked"{{/if}}
+ />
+ {{/if}}
{{if $group.edit}}
- <a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><i id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer icon-pencil"></i></a>
+ <a class="pull-right group-edit-icon" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="icon-pencil"></i></a>
{{/if}}
- <span class="sidebar-group-name"><a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a></span>
+ <a class="{{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
</li>
- {{/foreach}}
- </ul>
-</div>
-
- <div id="sidebar-new-group">
- <a href="group/new">{{$createtext}}</a>
- </div>
-
+ {{/foreach}}
+ <li>
+ <a href="group/new">{{$createtext}}</a>
+ </li>
+ </ul>
+ </div>
</div>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index c51dc02a5..be896adb5 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -112,7 +112,7 @@
<span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> -->
<span class="icon-calendar"></span>
</span>
- <input id="expiration-date" type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/>
+ <input id="expiration-date" type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/>
</div>
</div>
<!-- </div> -->
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
index 723a64019..3e32eae14 100755
--- a/view/tpl/message_side.tpl
+++ b/view/tpl/message_side.tpl
@@ -1,11 +1,14 @@
-<div id="message-sidebar" class="widget">
- <div id="message-check" class="btn btn-default"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div>
- <div id="message-new" class="btn btn-default"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
-
- <ul class="message-ul">
+<div class="widget">
+ <h3>{{$title}}</h3>
+ <ul class="nav nav-pills nav-stacked">
+ <li><a href="{{$check.url}}"{{if $check.sel}} class="checkmessage-selected"{{/if}}>{{$check.label}}</a></li>
+ <li><a href="{{$new.url}}"{{if $new.sel}} class="newmessage-selected"{{/if}}>{{$new.label}}</a></li>
+ </ul>
+ {{if $tabs}}
+ <ul class="nav nav-pills nav-stacked">
{{foreach $tabs as $t}}
- <li class="tool"><a href="{{$t.url}}" class="message-link{{if $t.sel}}message-selected{{/if}}">{{$t.label}}</a></li>
+ <li><a href="{{$t.url}}"{{if $t.sel}} class="message-selected"{{/if}}>{{$t.label}}</a></li>
{{/foreach}}
</ul>
-
+ {{/if}}
</div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 62591c648..c0e891547 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -1,6 +1,8 @@
-<h3>{{$pagename}}</h3>
-
-<div id="photos-usage-message" class="usage-message">{{$usage}}</div>
+<div class="section-title-wrapper">
+ <div id="photos-usage-message" class="pull-right">{{$usage}}</div>
+ <h2>{{$pagename}}</h2>
+ <div class="clear"></div>
+</div>
<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" />
diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
index 0867ab392..1104d61bb 100755
--- a/view/tpl/posted_date_widget.tpl
+++ b/view/tpl/posted_date_widget.tpl
@@ -1,16 +1,20 @@
<div id="datebrowse-sidebar" class="widget">
<h3>{{$title}}</h3>
-<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
-<ul id="posted-date-selector">
-{{foreach $dates as $y => $arr}}
-<li id="posted-date-selector-year-{{$y}}" class="fakelink" onclick="openClose('posted-date-selector-{{$y}}');">{{$y}}</li>
-<div id="posted-date-selector-{{$y}}" style="display: none;">
-<ul class="posted-date-selector-months">
-{{foreach $arr as $d}}
-<li class="posted-date-li"><a href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}&dbegin={{$d.2}}'); return false;">{{$d.0}}</a></li>
-{{/foreach}}
-</ul>
-</div>
-{{/foreach}}
-</ul>
+ <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
+ <ul id="posted-date-selector" class="nav nav-pills nav-stacked">
+ {{foreach $dates as $y => $arr}}
+ <li id="posted-date-selector-year-{{$y}}">
+ <a href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a>
+ </li>
+ <div id="posted-date-selector-{{$y}}" style="display: none;">
+ <ul class="posted-date-selector-months nav nav-pills nav-stacked">
+ {{foreach $arr as $d}}
+ <li>
+ <a href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}&dbegin={{$d.2}}'); return false;">{{$d.0}}</a>
+ </li>
+ {{/foreach}}
+ </ul>
+ </div>
+ {{/foreach}}
+ </ul>
</div>