diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl
index ade0c473bc..c9ab17aa5d 100644
--- a/view/admin_aside.tpl
+++ b/view/admin_aside.tpl
@@ -7,12 +7,11 @@
var register = $(data).find('register').text();
if (register=="0") { reigster=""; elm.hide();} else { elm.show(); }
elm.html(register);
- console.log(elm, data, register);
});
});
-
+
- $admin.site.1
- $admin.users.1
- $admin.plugins.1
@@ -20,7 +19,7 @@
{{ if $admin.plugins_admin }}Plugins
{{ endif }}
-
+
{{ for $admin.plugins_admin as $l }}
- $l.1
{{ endfor }}
@@ -28,6 +27,6 @@
Logs
-
+
diff --git a/view/admin_plugins.tpl b/view/admin_plugins.tpl
index ee0fa67e6f..bb1f5c90f7 100644
--- a/view/admin_plugins.tpl
+++ b/view/admin_plugins.tpl
@@ -4,7 +4,7 @@
{{ for $plugins as $p }}
-
-
+
$p.2.name - $p.2.version
$p.2.description
diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png
index b016fe33be..e2712ee306 100644
Binary files a/view/theme/dispy/icons.png and b/view/theme/dispy/icons.png differ
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index eab3af7007..aa9e0bfafc 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -9,8 +9,8 @@ tinyMCE.init({
theme : "advanced",
mode : "specific_textareas",
editor_selector: /(profile-jot-text|prvmail-text)/,
- plugins : "bbcode,paste",
- theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+ plugins : "bbcode,paste,fullscreen,autoresize",
+ theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index 3938777e96..2455105f26 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -2,6 +2,7 @@ $langselector
$banner
+$nav.help.1
{{ if $nav.login }}$nav.login.1 {{ endif }}
$nav.search.1
$nav.directory.1
@@ -30,6 +31,7 @@ $langselector
{{ if $nav.manage }}- $nav.manage.1
{{ endif }}
+ {{ if $nav.admin }}- $nav.admin.1
{{ endif }}
{{ if $nav.logout }}- $nav.logout.1
{{ endif }}
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 36702b3e8b..34c880ac07 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -138,14 +138,17 @@ nav .nav-link {
background: transparent url('icons.png') 0px 0px no-repeat;
}
-#nav-directory-link { background-position: 0px -22px }
-#nav-directory-link:hover { background-position: -22px -22px;}
-#nav-search-link { background-position: 0px -44px }
-#nav-search-link:hover { background-position: -22px -44px;}
-#nav-apps-link { background-position: 0px -66px }
-#nav-apps-link:hover { background-position: -22px -66px;}
-#nav-login-link { background-position: 0px -88px }
-#nav-login-link:hover { background-position: -22px -88px;}
+#nav-directory-link { background-position: 0px -22px }
+#nav-directory-link:hover { background-position: -22px -22px;}
+#nav-search-link { background-position: 0px -44px }
+#nav-search-link:hover { background-position: -22px -44px;}
+#nav-apps-link { background-position: 0px -66px }
+#nav-apps-link:hover { background-position: -22px -66px;}
+#nav-login-link { background-position: 0px -88px }
+#nav-login-link:hover { background-position: -22px -88px;}
+#nav-help-link { background-position: 0px -110px }
+#nav-help-link:hover { background-position: -22px -110px;}
+
#notifications {
height: 20px; width: 100%;
@@ -248,6 +251,11 @@ aside #viewcontacts { text-align: right;}
padding: 0.2em 0.5em;
}
+
+#netsearch-box {
+ margin: 30px 0px;
+}
+
/**
* contacts block
*/
@@ -484,6 +492,9 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.wall-item-photo-menu li a { white-space: nowrap; display: block; padding: 5px 2px; color: #eeeeec; }
.wall-item-photo-menu li a:hover { color: #555753; background: #eeeeec; }
+.icon.drop,
+.icon.drophide { float: left; }
+#item-delete-selected { overflow: auto; width: 100%}
/**
* comment
*/
@@ -537,6 +548,16 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
border: 0px;
}
+/**
+ * item text style
+ **/
+.wall-item-body code {
+ border-color: #CCCCCC;
+ border-style: solid;
+ border-width: 1px 1px 1px 10px;
+ display: block;
+ padding-left: 10px;
+}
@@ -779,6 +800,93 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
*/
.directory-item {float: left; margin: 50px 50px 0px 0px;}
+/**
+ * ADMIN
+ */
+#pending-update {
+ float:right;
+ color: #ffffff;
+ font-weight: bold;
+ background-color: #FF0000;
+ padding: 0em 0.3em;
+}
+.admin.linklist {
+ border: 0px; padding: 0px;
+}
+.admin.link {
+ list-style-position: inside;
+}
+
+#adminpage dl {
+ clear: left;
+ margin-bottom: 2px;
+ padding-bottom: 2px;
+ border-bottom: 1px solid black;
+}
+#adminpage dt {
+ width: 200px;
+ float: left;
+ font-weight: bold;
+}
+#adminpage dd {
+ margin-left: 200px;
+}
+
+#adminpage .field {
+ clear: left;
+ margin-bottom: 5px;
+ padding-bottom: 5px;
+}
+
+#adminpage .field label {
+ float: left;
+ width: 200px;
+ font-weight: bold;
+}
+
+#adminpage .field input,
+#adminpage .field textarea {
+ width: 400px;
+}
+#adminpage .field textarea { height: 100px; }
+#adminpage .field_help {
+ display: block;
+ margin-left: 200px;
+ color: #666666;
+
+}
+
+#adminpage h3 {
+ border-bottom: 1px solid #cccccc;
+}
+
+#adminpage .submit {
+ clear:left;
+}
+
+#adminpage #pluginslist {
+ margin: 0px; padding: 0px;
+}
+#adminpage .plugin {
+ list-style: none;
+ display: block;
+ border: 1px solid #888888;
+ padding: 1em;
+ margin-bottom: 5px;
+ clear: left;
+}
+#adminpage .toggleplugin {
+ float:left;
+ margin-right: 1em;
+}
+
+#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table th { text-align: left;}
+#adminpage td .icon { float: left;}
+#adminpage table#users img { width: 16px; height: 16px; }
+#adminpage table tr:hover { background-color: #bbc7d7; }
+#adminpage .selectall { text-align: right; }
+
/**
* ICONS
*/
@@ -829,16 +937,24 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.attach { background-position: -190px -40px;}
.language { background-position: -210px -40px;}
+
+.on { background-position: -50px -60px;}
+.off { background-position: -70px -60px;}
+
+
+
+.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
+
.attachtype {
display: block; width: 20px; height: 23px;
background-image: url('../../../images/content-types.png');
}
-.type-video { background-position: 0px; 0px; }
-.type-image { background-position: -20px; 0px; }
-.type-audio { background-position: -40px; 0px; }
-.type-text { background-position: -60px; 0px; }
-.type-unkn { background-position: -80px; 0px; }
+.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text { background-position: -60px 0px; }
+.type-unkn { background-position: -80px 0px; }
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index a8d40886f3..c6ce8ea2cb 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -104,7 +104,7 @@ nav #site-location {
nav #banner {
display: block;
- padding-top: 14px;
+ margin-top: 14px;
position: absolute;
}
nav #banner #logo-text a {
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index d43ab19edc..98ab96d2b1 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2556,6 +2556,13 @@ a.mail-list-link {
/**
* ADMIN
*/
+#pending-update {
+ float:right;
+ color: #ffffff;
+ font-weight: bold;
+ background-color: #FF0000;
+ padding: 0em 0.3em;
+}
#adminpage dl {
clear: left;
@@ -2615,7 +2622,7 @@ a.mail-list-link {
margin-bottom: 5px;
clear: left;
}
-#adminpage .plugin .toggle {
+#adminpage .toggleplugin {
float:left;
margin-right: 1em;
}