aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/group_selection.tpl8
-rw-r--r--view/pagetypes.tpl3
-rw-r--r--view/settings.tpl5
-rw-r--r--view/theme/darkzero-NS/style.css75
-rw-r--r--view/theme/darkzero/style.css33
-rw-r--r--view/theme/diabook/diabook-dark/style-network.css7
-rw-r--r--view/theme/diabook/diabook-dark/style-profile.css2
-rw-r--r--view/theme/dispy/dark/style.css2
-rw-r--r--view/theme/dispy/dark/style.less4
-rw-r--r--view/theme/dispy/light/style.css2
-rw-r--r--view/theme/dispy/light/style.less2
-rw-r--r--view/theme/duepuntozero/style.css5
12 files changed, 127 insertions, 21 deletions
diff --git a/view/group_selection.tpl b/view/group_selection.tpl
new file mode 100644
index 000000000..3809cb994
--- /dev/null
+++ b/view/group_selection.tpl
@@ -0,0 +1,8 @@
+<div class="field custom">
+<label for="group-selection" id="group-selection-lbl">$label</label>
+<select name="group-selection" id="group-selection" >
+{{ for $groups as $group }}
+<option value="$group.id" {{ if $group.selected }}selected="selected"{{ endif }} >$group.name</option>
+{{ endfor }}
+</select>
+</div>
diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl
index d9f873ea0..924fc47ac 100644
--- a/view/pagetypes.tpl
+++ b/view/pagetypes.tpl
@@ -2,3 +2,6 @@
{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
+ {{ if $experimental }}
+ {{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
+ {{ endif }} \ No newline at end of file
diff --git a/view/settings.tpl b/view/settings.tpl
index cec3c6f64..556cd3ba3 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -56,9 +56,12 @@ $suggestme
$unkmail
+
{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
<div class="field input">
<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
<div style="display: none;">
@@ -90,6 +93,8 @@ $unkmail
<br/>
<div id="settings-default-perms-end"></div>
+$group_select
+
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Submit" />
diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css
index 047381a92..1efe093ed 100644
--- a/view/theme/darkzero-NS/style.css
+++ b/view/theme/darkzero-NS/style.css
@@ -22,9 +22,14 @@ div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); }
nav #banner #logo-text a { color: #ffffff; }
-.wall-item-content-wrapper { border: 1px solid #444444; }
+.wall-item-content-wrapper {
+border: 1px solid #444444;
+background: #444;
+
+}
.wall-item-tools { background-color: #444444; background-image: none;}
-.comment-edit-wrapper{ background-color: #333333; }
+.comment-wwedit-wrapper{ background-color: #333333; }
+.comment-edit-preview{ color: #000000; }
.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
.photo-top-album-name{ background-color: #333333; }
.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
@@ -75,25 +80,77 @@ input#dfrn-url {
}
-#jot-title {
+#jot-title, #jot-category {
background-color: #333333;
border: 1px solid #333333;
}
#jot-title::-webkit-input-placeholder{ color: #555555!important;}
#jot-title:-moz-placeholder{color: #555555!important;}
+#jot-category::-webkit-input-placeholder{ color: #555555!important;}
+#jot-category:-moz-placeholder{color: #555555!important;}
#jot-title:hover,
-#jot-title:focus {
+#jot-title:focus,
+#jot-category:hover,
+#jot-category:focus {
border: 1px solid #cccccc;
}
-
-.wall-item-content {
- max-height: 20000px;
- overflow: none;
-}
blockquote {
background: #ddd;
color: #000;
}
+
+.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
+ color: #eec;
+}
+
+input#acl-search {
+ background-color: #aaa;
+}
+
+
+
+.notify-seen {
+ background:#666;
+}
+
+#nav-notifications-menu {
+ background: #2e2e2f;
+}
+
+#nav-notifications-menu li:hover {
+ background: #444;
+}
+
+.acpopupitem{
+ background:#2e2f2e;
+}
+
+code {
+ background:#2e2f2e !important;
+ color:#fff !important;
+}
+
+blockquote {
+ background:#2e2f2e !important;
+ color:#eec !important;
+}
+
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+ background:#2e2f2e;
+}
+
+#fancybox-content{
+ background:#444;
+}
+
+
+
+
+
+.wall-item-content {
+ max-height: 20000px;
+ overflow: none;
+} \ No newline at end of file
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index a3df740eb..6f238bec6 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -22,7 +22,11 @@ div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); }
nav #banner #logo-text a { color: #ffffff; }
-.wall-item-content-wrapper { border: 1px solid #444444; }
+.wall-item-content-wrapper {
+border: 1px solid #444444;
+background: #444;
+
+}
.wall-item-tools { background-color: #444444; background-image: none;}
.comment-wwedit-wrapper{ background-color: #333333; }
.comment-edit-preview{ color: #000000; }
@@ -99,7 +103,7 @@ blockquote {
}
.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
- color: #000000;
+ color: #eec;
}
input#acl-search {
@@ -118,4 +122,27 @@ input#acl-search {
#nav-notifications-menu li:hover {
background: #444;
-} \ No newline at end of file
+}
+
+.acpopupitem{
+ background:#2e2f2e;
+}
+
+code {
+ background:#2e2f2e !important;
+ color:#fff !important;
+}
+
+blockquote {
+ background:#2e2f2e !important;
+ color:#eec !important;
+}
+
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+ background:#2e2f2e;
+}
+
+#fancybox-content{
+ background:#444;
+}
+
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index 678e8597c..ee2e76d3b 100644
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -464,7 +464,7 @@ code {
position: absolute;
width: 12em;
background: #2e2f2e;
- color: #2e2f2e;
+ color: #eec;
margin: 0px;
padding: 1em;
list-style: none;
@@ -667,7 +667,7 @@ nav .nav-menu-icon:hover {
}
nav .nav-menu-icon.selected {
- background-color: #fff;
+ background-color: #308dbf;
}
nav .nav-menu-icon img {
width: 22px;
@@ -1434,7 +1434,8 @@ transition: all 0.2s ease-in-out;
}
.wall-item-comment-wrapper textarea {
height: 2.0em;
- width: 100%;
+ /**No idea what's going on here, but at 100%, it's fugly **/
+ width: 98% !important;
font-size: 10px;
color: #999999;
border: 1px solid #2e2e2f;
diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css
index 4b6bc15b5..216ccfc58 100644
--- a/view/theme/diabook/diabook-dark/style-profile.css
+++ b/view/theme/diabook/diabook-dark/style-profile.css
@@ -1216,7 +1216,7 @@ right_aside {
/* background: #F1F1F1; */
}
-right_aside a{color: #1872A2;}
+right_aside a{color: #88a9d2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 114769727..3bb30be83 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -57,7 +57,7 @@ h6{font-size:xx-small;}
#articlemain{width:100%;height:100%;margin:0 auto;}
.button,#profile-listing-desc{color:#eeeecc;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
.button a,#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#2e2f2e;border:1px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:1px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
.intro-approve-as-friend-desc{margin-top:10px;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index f2714b717..4967ac9c2 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -301,8 +301,8 @@ h6 {
}
[class$="-desc"],
[id$="-desc"] {
- color: @bg_colour;
- // background: @main_colour;
+ color: @main_colour;
+ background: @bg_colour;
.borders(1px, outset, @main_colour);
.rounded_corners;
// .box_shadow(3px, 3px, 5px);
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index f6336c55b..1099f0913 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -57,7 +57,7 @@ h6{font-size:xx-small;}
#articlemain{width:100%;height:100%;margin:0 auto;}
.button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
.button a,#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#eeeeec;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#111111;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
.intro-approve-as-friend-desc{margin-top:10px;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index d2f72520f..4e1b85031 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -303,7 +303,7 @@ h6 {
[class$="-desc"],
[id$="-desc"] {
color: @bg_colour;
- // background: @main_colour;
+ background: @main_colour;
.borders(1px, outset, @bg_colour);
.rounded_corners;
// .box_shadow(3px, 3px, 5px);
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b978c13e5..826acc7ef 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1091,6 +1091,11 @@ input#dfrn-url {
overflow: auto;
}
+.wall-item-content img {
+ max-width: 700px;
+}
+
+
.wall-item-title {
float: left;
font-weight: bold;