Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

18 files changed, 669 insertions, 0 deletions

diff --git a/www/themes/default/icon.png b/www/themes/default/icon.png
new file mode 100644
index 0000000..be864a7
--- /dev/null
+++ b/www/themes/default/icon.png
diff --git a/www/themes/default/images/b_edit.png b/www/themes/default/images/b_edit.png
new file mode 100644
index 0000000..05711a0
--- /dev/null
+++ b/www/themes/default/images/b_edit.png
diff --git a/www/themes/default/images/bg_admin.png b/www/themes/default/images/bg_admin.png
new file mode 100644
index 0000000..c707779
--- /dev/null
+++ b/www/themes/default/images/bg_admin.png
diff --git a/www/themes/default/images/bg_bar.png b/www/themes/default/images/bg_bar.png
new file mode 100644
index 0000000..7152ba1
--- /dev/null
+++ b/www/themes/default/images/bg_bar.png
diff --git a/www/themes/default/images/bg_header.png b/www/themes/default/images/bg_header.png
new file mode 100644
index 0000000..6fa4161
--- /dev/null
+++ b/www/themes/default/images/bg_header.png
diff --git a/www/themes/default/images/bg_sidebar.png b/www/themes/default/images/bg_sidebar.png
new file mode 100644
index 0000000..0edb153
--- /dev/null
+++ b/www/themes/default/images/bg_sidebar.png
diff --git a/www/themes/default/images/loading.gif b/www/themes/default/images/loading.gif
new file mode 100644
index 0000000..859126e
--- /dev/null
+++ b/www/themes/default/images/loading.gif
diff --git a/www/themes/default/images/logo.png b/www/themes/default/images/logo.png
new file mode 100644
index 0000000..4afe565
--- /dev/null
+++ b/www/themes/default/images/logo.png
diff --git a/www/themes/default/images/logo_24.gif b/www/themes/default/images/logo_24.gif
new file mode 100644
index 0000000..d5af64d
--- /dev/null
+++ b/www/themes/default/images/logo_24.gif
diff --git a/www/themes/default/images/rss.gif b/www/themes/default/images/rss.gif
new file mode 100644
index 0000000..094ba10
--- /dev/null
+++ b/www/themes/default/images/rss.gif
diff --git a/www/themes/default/images/thumbs_up.orig.png b/www/themes/default/images/thumbs_up.orig.png
new file mode 100644
index 0000000..1a89d0e
--- /dev/null
+++ b/www/themes/default/images/thumbs_up.orig.png
diff --git a/www/themes/default/images/vote-against-voted.png b/www/themes/default/images/vote-against-voted.png
new file mode 100644
index 0000000..740dfc8
--- /dev/null
+++ b/www/themes/default/images/vote-against-voted.png
diff --git a/www/themes/default/images/vote-against.png b/www/themes/default/images/vote-against.png
new file mode 100644
index 0000000..f15ea4d
--- /dev/null
+++ b/www/themes/default/images/vote-against.png
diff --git a/www/themes/default/images/vote-for-voted.png b/www/themes/default/images/vote-for-voted.png
new file mode 100644
index 0000000..5abd43e
--- /dev/null
+++ b/www/themes/default/images/vote-for-voted.png
diff --git a/www/themes/default/images/vote-for.png b/www/themes/default/images/vote-for.png
new file mode 100644
index 0000000..5973ae9
--- /dev/null
+++ b/www/themes/default/images/vote-for.png
diff --git a/www/themes/default/scuttle.css b/www/themes/default/scuttle.css
new file mode 100644
index 0000000..9e87857
--- /dev/null
+++ b/www/themes/default/scuttle.css
@@ -0,0 +1,657 @@
+/* Watch out. This file bugs (in the header) when it is formated with Eclipse (Ctrl+Shift+F)*/
+
+/* BASE */
+
+* {
+    font-family: "trebuchet ms", tahoma, sans-serif;
+}
+a {
+    color: #47A;
+    text-decoration: none;
+}
+a:hover {
+    color: #258;
+    text-decoration: underline;
+}
+a img {
+    border: 0;
+}
+
+
+body {
+    margin: 0;
+    padding: 0;
+}
+input[type=text],
+input[type=password],
+select,
+textarea {
+    border: 1px solid #AAA;
+    padding: 0.1em;
+}
+input[type=text],
+input[type=password],
+textarea {
+    padding: 0.2em;
+}
+input[type=text]:focus,
+input[type=password]:focus,
+select:focus,
+textarea:focus {
+    border-color: #666;
+}
+p.tipMsg,
+p.error,
+p.success {
+    border: 1px solid;
+    font-size: small;
+    margin: 0.5em;
+    padding: 0.5em;
+    width: 70%;
+}
+p.tipMsg {
+    background: #FFFF99;
+    border-color: #CC9900;
+    color: #CC9900;
+}
+p.error {
+    background: #FCC;
+    border-color: #966;
+    color: #633;
+}
+p.success {
+    background: #CFC;
+    border-color: #696;
+    color: #363;
+}
+td#availability {
+    color: #285;
+    font-weight: bold;
+}
+td#availability.not-available {
+    color: #F00;
+}
+textarea {
+    font-size: small;
+    padding: 0.2em;
+}
+th {
+    padding-right: 1em;
+    text-align: right;
+}
+
+/* HEADER */
+
+div#header {
+    background: #FFF url('images/bg_header.png') bottom repeat-x;
+    border-bottom: 3px solid #9CD;
+    clear: both;
+}
+div#header:after {
+    content: "."; 
+    display: block; 
+    height: 0; 
+    clear: both; 
+    visibility: hidden;
+}
+* html div#header {
+    height: 1%;
+}
+h1 {
+    float: left;
+    font-size: x-large;
+    font-weight: bold;
+    letter-spacing: 0.25em;
+    margin: 0;
+    padding: 1em;
+}
+html > body h1 {
+    background: url('images/logo.png') no-repeat 10px;
+    padding-left: 75px;
+}
+html > body div#header.popup h1 {
+    background: url('images/logo_24.gif') no-repeat 10px;
+    padding: 0.5em 0.5em 0.5em 50px;
+}
+/*html > body div#header #welcome {
+    position:absolute;
+    left:75px;
+}*/
+#welcome {
+    border: 10px solid #995;
+    width: 66%;
+    padding: 10px;
+    text-align:center;
+    font-size: medium;
+}
+#bottom {
+	padding-top: 10px;
+	text-align: center;
+	font-size: xx-small;
+}
+h1 a {
+    color: #000;
+}
+h1 a:hover {
+    color: #000;
+}
+h2 {
+    background: #666 url('images/bg_bar.png') center center repeat-x;
+    border-bottom: 3px solid #DDD;
+    clear: both;
+    color: #FFF;
+    font-size: medium;
+    letter-spacing: 0.1em;
+    margin: 0 0 1em 0;
+    padding: 0.5em 1em;
+}
+h2 a, h2 a:hover {
+    color: #DDD;
+}
+
+/*sup {
+    color: #77ABE0;
+    font-weight: bold;
+}*/
+
+/* NAVIGATION */
+
+ul#navigation {
+    list-style-type: none;
+    margin: 0;
+    padding: 1.75em 1em;
+    width: auto;
+}
+ul#navigation a {
+    font-size: medium;
+    font-weight: bold;
+    padding: 0.2em 0.5em;
+}
+ul#navigation a:hover {
+    background: #7AD;
+    color: #FFF;
+}
+ul#navigation li {
+    float: left;
+}
+ul#navigation li.access {
+    float: right;
+}
+
+/* BOOKMARKS */
+
+ol#bookmarks {
+    list-style-type: none;
+    margin: 0;
+    padding: 0 1em;
+    width: 70%;
+}
+html > body ol#bookmarks {
+    margin: 0 1em;
+    padding: 0;
+}
+img.thumbnail {	
+    float: left;
+    padding: 1px;
+    margin-right: 6px;
+    margin-bottom:4px;
+    cursor:pointer;
+    border:1px solid #AAA;
+}
+div.link a {
+    color: blue;
+    font-size: medium;
+}
+div.link a:visited {
+    color: purple;
+}
+div.address {
+    color: #285;
+}
+div.meta {
+    color: #285;
+}
+div.meta span {
+    color: #F00;
+}
+div.privateNote {
+    font-variant: small-caps;
+    font-size: small;
+    text-align: right;
+}
+li.xfolkentry {
+    border-bottom: 1px solid #DDD;
+    margin-bottom: 0;
+    padding: 1em 0.5em;
+}
+html > body li.xfolkentry {
+    border-bottom: 1px dotted #AAA;
+}
+li.xfolkentry div {
+    padding: 0.1em;
+}
+li.xfolkentry.deleted {
+    opacity: 0.5;
+}
+li.xfolkentry.private {
+    border-left: 3px solid #F00;
+}
+li.xfolkentry.shared {
+    border-left: 3px solid #FA0;
+}
+li.below-threshold > div {
+    border-right: 5px dotted #F00;
+}
+
+li.xfolkentry div div.description span.anchorBookmark {
+    /*font-family:monospace;*/
+}
+
+/* bookmark voting */
+.vote-badge {
+    float: left;
+    width: 3em;
+    margin: 5px;
+    border: 1px solid #CCCC88;
+    font-weight: bold;
+    /*border-radius: 10px;*/
+    -moz-border-radius: 10px;
+}
+.vote-badge span, .vote-badge a {
+    display: block;
+    text-align: center;
+}
+.vote-badge a:hover {
+    text-decoration: none;
+}
+.vote-badge .vote-for {
+    /*border-top-right-radius: 10px;*/
+    /*border-top-left-radius: 10px;*/
+    -moz-border-radius-topright: 10px;
+    -moz-border-radius-topleft: 10px;
+}
+.vote-badge .vote-against {
+    /*border-bottom-right-radius: 10px;*/
+    /*border-bottom-left-radius: 10px;*/
+    -moz-border-radius-bottomright: 10px;
+    -moz-border-radius-bottomleft: 10px;
+}
+.vote-badge a.vote-for:hover {
+    background-color: #ccffbb;
+}
+.vote-badge a.vote-against:hover {
+    background-color: #ffcccc;
+}
+.vote-badge-for .vote-for-inactive {
+    color: transparent;
+    background-color: #ccffbb;
+}
+.vote-badge-against .vote-against-inactive {
+    color: transparent;
+    background-color: #ffcccc;
+}
+
+/* bookmark voting horizontal */
+div.vote-horiz .voting {
+    font-weight: bold;
+}
+li.xfolkentry div.vote-horiz-for {
+/*    border-left: 1em solid #ccffbb;*/
+/*    padding-left: 0.5em;*/
+}
+li.xfolkentry div.vote-horiz-against {
+/*    border-left: 1em solid #ffcccc;*/
+/*    padding-left: 0.5em;*/
+}
+.vote-horiz a, .vote-horiz .vote-for-inactive,
+.vote-horiz .vote-against-inactive {
+    padding-left: 1.5em;
+    margin-left: 0.7em;
+}
+.vote-horiz a.vote-for:hover {
+    background-color: #ccffbb;
+}
+.vote-horiz a.vote-against:hover {
+    background-color: #ffcccc;
+}
+.vote-horiz .vote-for-inactive, .vote-horiz .vote-against-inactive {
+    color: #AAA;
+}
+.vote-horiz .vote-for {
+    background: url(images/vote-for.png) no-repeat;
+}
+.vote-horiz .vote-against {
+    background: url(images/vote-against.png) no-repeat;
+}
+.vote-horiz .vote-for-inactive {
+    background: url(images/vote-for-voted.png) no-repeat;
+}
+.vote-horiz .vote-against-inactive {
+    background: url(images/vote-against-voted.png) no-repeat;
+}
+
+
+/* SIDEBAR */
+
+div#sidebar {
+    font-size: small;
+    position: absolute;
+    right: 1em;
+    top: 10em;
+    width: 25%;
+}
+div#sidebar a {
+    color: #995;
+}
+div#sidebar a:hover {
+    color: #773;
+}
+div#sidebar>div {
+    background: #FFF url('images/bg_sidebar.png') bottom repeat-x;
+    border: 1px solid #CC8;
+    color: #555;
+    margin-bottom: 1em;
+}
+div#sidebar h2 {
+    background: transparent;
+    border: 0;
+    color: #995;
+    letter-spacing: 0;
+    margin: 0;
+    padding: 0.5em 0;
+}
+div#sidebar hr {
+    display: none;
+}
+div#sidebar p {
+    margin: 1em;
+}
+div#sidebar p.tags a {
+    margin: 0;
+}
+div#sidebar table {
+    margin: 0.5em 0.5em 0 0.5em;
+}
+div#sidebar table td {
+    padding-bottom: 0.25em;
+    padding-right: 0.5em;
+}
+/*
+div#sidebar ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0.5em;
+}
+div#sidebar ul li {
+    margin: 0.5em 0;
+}*/
+
+div#related {
+    padding: 0.5em;
+}
+
+.crossTags {
+    padding:0px 3px;    
+    border: 1px solid #999955
+}
+
+div#sidebar>div#maintagsmenu {
+    padding: 0.5em;
+    border: 5px solid #999955
+}
+
+
+
+/* TAGS */
+
+p.commondescription {
+    padding-left:5px;
+    color: #555;
+    font-weight: bold;
+    font-size: medium;
+    border-left: 1px solid #CC8;
+    width: 70%;
+}
+
+p.tags {
+    line-height: 2.25em;
+    /*margin: 2em 10%;*/
+    text-align: justify;
+    vertical-align: middle;
+    width: 70%;
+}
+p.tags a,
+p.tags span {
+    color: #47A;
+    margin-right: 0.5em;
+}
+p.tags span:hover {
+    cursor: pointer;
+    text-decoration: underline;
+}
+p.tags span.selected {
+    background: #CEC;
+}
+
+.anchor {
+    cursor: pointer;
+    text-decoration: underline;
+}
+
+.treeTag {
+	color: #999955;
+}
+.treeTag:hover {
+    cursor: pointer;
+    text-decoration: underline;
+}
+.treeTag.selected {
+    background: #CEC;
+}
+
+/* PROFILE */
+
+table.profile th {
+    width: 10em;
+}
+
+table tr.ssl-current td {
+    background-color: #AFA;
+}
+
+/* OTHER GUFF */
+
+dd {
+	background: #CEC;
+	border-right: 4px solid #ACA;
+	color: #464;
+	padding: 6px;
+}
+dd a {
+	color: #464;
+}
+dd a:hover {
+	color: #000 !important;
+	text-decoration: underline !important;
+}
+
+dl {
+	font-size: small;
+	margin: 1em;
+	width: 70%;
+}
+dl#profile dd {
+	background: #CDE;
+	border-color: #ABC;
+	color: #247;
+}
+dl#profile dt {
+	background: #BCE;
+	border-color: #9AC;
+	color: #245;
+	display: block;
+	font-weight: bold;
+	padding: 6px;
+}
+dl#profile a {
+	color: #446;
+}
+dl#profile a:hover {
+	color: #000 !important;
+	text-decoration: underline !important;
+}
+dl#meta dd {
+	line-height: 1.5em;
+}
+dl#meta dt {
+	background: #BDB;
+	color: #353;
+	display: block;
+	font-weight: bold;
+	padding: 6px;
+}
+dt {
+	border-right: 4px solid #9B9;
+}
+dt a {
+	background: #BDB;
+	color: #353;
+	display: block;
+	font-weight: bold;
+	padding: 6px;
+}
+dt a:hover {
+    background: #ACA;
+    border: 0;
+}
+form {
+	margin: 0;
+}
+form#search {
+       margin-right: 0.75em;
+       color: #CCC;
+       font-size: small;
+       float: right;
+       margin: 0;
+       position: absolute;
+       right: 0;
+       top: 6.4em;
+}
+form label,
+form td,
+form th {
+	font-size: small;
+}
+form table {
+	margin: 0 1em;
+}
+h3 {
+	background: #DDD;
+	color: #555;
+	font-size: small;
+	letter-spacing: 0.2em;
+	margin: 2em 1em 1em 1em;
+	padding: 0.25em 0.75em;
+}
+li {
+	font-size: small;
+	margin-bottom: 0.5em;
+}
+p {
+    font-size: small;
+    margin: 1em;
+}
+p#sort {
+    /*color: #CCC;*/
+    font-size: small;
+    /*float: right;*/
+    /*margin: 0;*/
+    /*position: absolute;*/
+    right: 0;
+    top: 7em;
+}
+html > body p#sort {
+    /*margin-right: 0.75em;*/
+}
+p#sort a {
+    background: #AAA;
+    color: #555;
+    font-weight: normal;
+    margin-right: 0.5em;
+    padding: 0 1em;
+}
+html > body p#sort a {
+    margin-right: 0;
+}
+p#sort a:hover {
+    background: #CCC;
+    text-decoration: none !important;
+}
+p#sort span {
+    display: none;
+}
+
+p.backToTop{
+	text-align:center;
+}
+
+p.paging {
+	font-size: small;
+	margin-left: 1em;
+	text-align:center;
+}
+p.paging a,
+p.paging span.disable {
+	background: #888;
+	color: #FFF;
+	display: inline;
+	margin-right: 0.5em;
+	padding: 0.25em 1em;
+}
+p.paging a:hover {
+	background: #666;
+}
+p.paging span {
+	display: none;
+}
+p.paging span.disable {
+	background: #DDD;
+	color: #AAA;
+}
+div.collapsible p.tags {
+	line-height: 2.25em;
+	margin: 1em 2em;
+}
+th label {
+	padding-right: 1em;
+}
+ul {
+	margin-right: 1em;
+	width: 75%;
+}
+
+.adminBackground {
+    /*background: #FFFFFF url(images/logo_24.png) no-repeat scroll center right;*/    
+    /*border-top: 1px solid;
+    border-color: #CC9900;*/
+}
+
+.adminBackground {
+	background: #FFF url('images/bg_admin.png') repeat-y top right;
+}
+
+a.bookmarklet {
+	padding: 2px;
+	background-color: #AAFAEE;
+}
+
+/* tree styles */
+#related-content.jstree-default.jstree-focused {
+    background: none !important;
+}
+
+
+/* add/edit bookmark */
+.ui-autocomplete {
+    width: 458px;
+}
diff --git a/www/themes/testdummy/images/logo.png b/www/themes/testdummy/images/logo.png
new file mode 100644
index 0000000..4a8f8ba
--- /dev/null
+++ b/www/themes/testdummy/images/logo.png
diff --git a/www/themes/testdummy/scuttle.css b/www/themes/testdummy/scuttle.css
new file mode 100644
index 0000000..c62cd19
--- /dev/null
+++ b/www/themes/testdummy/scuttle.css
@@ -0,0 +1,12 @@
+@import url(../default/scuttle.css);
+
+body {
+    background-color: #FEA;
+}
+
+html > body h1 {
+    background: url('images/logo.png') no-repeat 10px;
+}
+div#header {
+    background: #FEA;
+}