aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-08 21:50:41 +0200
committerzottel <github@zottel.net>2012-04-08 21:50:41 +0200
commit315d496290747aab8b3147dc24b822460071bb2d (patch)
tree4d3cd849580d7ba3b8c30667bbb6f0901dc7d738 /view
parentaaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (diff)
parent5c0446975516f2b52b6cf51618e0b75af56de71b (diff)
downloadvolse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.gz
volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.tar.bz2
volse-hubzilla-315d496290747aab8b3147dc24b822460071bb2d.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view')
-rw-r--r--view/api_test_xml.tpl1
-rw-r--r--view/theme/darkzero-NS/theme.php2
-rw-r--r--view/theme/darkzero/theme.php2
-rw-r--r--view/theme/diabook/style-network.css2
-rw-r--r--view/theme/diabook/style-profile.css2
-rw-r--r--view/theme/diabook/style-settings.css2
-rw-r--r--view/theme/diabook/style.css2
-rw-r--r--view/theme/duepuntozero/theme.php2
-rw-r--r--view/theme/greenzero/theme.php2
-rw-r--r--view/theme/purplezero/theme.php2
-rw-r--r--view/theme/slack-NS/theme.php2
-rw-r--r--view/theme/slackr/theme.php2
-rw-r--r--view/theme/vier/style.css79
13 files changed, 92 insertions, 10 deletions
diff --git a/view/api_test_xml.tpl b/view/api_test_xml.tpl
new file mode 100644
index 000000000..7509a2dc1
--- /dev/null
+++ b/view/api_test_xml.tpl
@@ -0,0 +1 @@
+<ok>$ok</ok>
diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php
index 2d3e4fd56..6c1aa7f12 100644
--- a/view/theme/darkzero-NS/theme.php
+++ b/view/theme/darkzero-NS/theme.php
@@ -11,6 +11,7 @@ $a->theme_info = array(
'extends' => 'duepuntozero',
);
+function darkzero_NS_init(&$a) {
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@@ -57,3 +58,4 @@ $('.savedsearchterm').hover(
</script>
EOT;
+} \ No newline at end of file
diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index 8c4d3e9ac..bbba3ef74 100644
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -12,6 +12,7 @@ $a->theme_info = array(
'extends' => 'duepuntozero',
);
+function darkzero_init(&$a) {
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@@ -58,3 +59,4 @@ $('.savedsearchterm').hover(
</script>
EOT;
+} \ No newline at end of file
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 5a4bdfd81..af6e4027a 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -2549,4 +2549,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
-} \ No newline at end of file
+}
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 79a0866be..6b05903d3 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -2546,4 +2546,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
-} \ No newline at end of file
+}
diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css
index fdb4f24c7..60e2f336b 100644
--- a/view/theme/diabook/style-settings.css
+++ b/view/theme/diabook/style-settings.css
@@ -2526,4 +2526,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
-} \ No newline at end of file
+}
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index c06449d01..e99aa5644 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -2687,4 +2687,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
-} \ No newline at end of file
+}
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 701fb1349..7b42088e1 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -1,6 +1,7 @@
<?php
$a->theme_info = array();
+function duepuntozero_init(&$a) {
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@@ -47,3 +48,4 @@ $('.savedsearchterm').hover(
</script>
EOT;
+}
diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php
index ceec4dd97..c80202475 100644
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
@@ -3,6 +3,7 @@ $a->theme_info = array(
'extends' => 'duepuntozero',
);
+function greenzero_init(&$a) {
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@@ -49,3 +50,4 @@ $('.savedsearchterm').hover(
</script>
EOT;
+} \ No newline at end of file
diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php
index ceec4dd97..b9613027c 100644
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
@@ -3,6 +3,7 @@ $a->theme_info = array(
'extends' => 'duepuntozero',
);
+function purplezero_init(&$a) {
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@@ -49,3 +50,4 @@ $('.savedsearchterm').hover(
</script>
EOT;
+} \ No newline at end of file
diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php
index ceec4dd97..a8934d03b 100644
--- a/view/theme/slack-NS/theme.php
+++ b/view/theme/slack-NS/theme.php
@@ -3,6 +3,7 @@ $a->theme_info = array(
'extends' => 'duepuntozero',
);
+function slack_NS_init(&$a) {
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@@ -49,3 +50,4 @@ $('.savedsearchterm').hover(
</script>
EOT;
+} \ No newline at end of file
diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
index ceec4dd97..78f5d40f0 100644
--- a/view/theme/slackr/theme.php
+++ b/view/theme/slackr/theme.php
@@ -3,6 +3,7 @@ $a->theme_info = array(
'extends' => 'duepuntozero',
);
+function slackr_init(&$a) {
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@@ -49,3 +50,4 @@ $('.savedsearchterm').hover(
</script>
EOT;
+} \ No newline at end of file
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 39f4ffea4..d8130e59f 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -108,6 +108,7 @@
.tools { background-position: -50px -40px;}
.lock { background-position: -70px -40px;}
+.unlock { background-position: -90px -40px;}
.video { background-position: -110px -40px;}
.youtube { background-position: -130px -40px;}
@@ -139,8 +140,8 @@
.icon {
display: block;
- width: 20px;
- height: 20px;
+ width: 18px;
+ height: 18px;
background-image: url('icons.png');
}
@@ -415,17 +416,21 @@ code {
background: #EEE;
}
.tool .label {
- float: left;
+/* float: left; */
}
.tool .action {
float: right;
}
.tool a {
- color: #000;
+/* color: #000; */
}
.tool a:hover {
- text-decoration: none;
+ text-decoration: underline;
+}
+.sidebar-group-element {
+/* color: #000; */
}
+
/* popup notifications */
div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
@@ -604,6 +609,10 @@ nav #nav-apps-link.selected {
padding: 5px 10px; */
}
+.notify-seen {
+ background: none repeat scroll 0 0 #DDDDDD;
+ }
+
ul.menu-popup {
position: absolute;
display: none;
@@ -970,6 +979,7 @@ section {
margin-bottom: 1px;
}
.wall-item-container .wall-item-actions-social a {
+ float: left;
margin-right: 1em;
}
.wall-item-container .wall-item-actions-tools {
@@ -1244,7 +1254,8 @@ section {
#jot #jot-tools li.loading img {
margin-top: 10px;
}
-#jot #jot-title {
+/* #jot */
+#jot-title {
border: 0px;
margin: 0px;
height: 20px;
@@ -1272,6 +1283,56 @@ section {
line-height: 20px;
padding-right: 20px;
}
+
+#profile-jot-submit {
+ float: right;
+ margin-left: 15px;
+}
+#profile-upload-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-attach-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-link-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-video-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-audio-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-location-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-nolocation-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#jot-perms-icon {
+ float: right;
+ margin-left: 15px;
+}
+#jot-preview-link {
+ float: right;
+}
+#profile-jot-end {
+ clear: both;
+}
+#profile-jot-text_tbl {
+ width: 800px;
+}
+#profile-jot-wrapper {
+ margin-bottom: 20px;
+}
+
/** buttons **/
/*input[type="submit"] {
border: 0px;
@@ -1585,6 +1646,12 @@ blockquote {
border-left: 1px solid #D2D2D2;
padding-left: 9px;
margin: 0 0 0 .8ex;
+ color: #777;
+}
+
+.oembed {
+ font-size: large;
+ font-weight: bold;
}
/* ================== */