aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-29 18:23:34 -0700
committerfriendica <info@friendica.com>2012-03-29 18:23:34 -0700
commitcd47ba6ed1236b14c5da832b686eea0be926f65a (patch)
tree7b7bcddc39c5107b7ddae4627e2fb73f30e9d54e
parent75f778a504c6032c6e029c741be8354419130741 (diff)
parent1326c1388e4a5b795037f940df24bfb303fb6767 (diff)
downloadvolse-hubzilla-cd47ba6ed1236b14c5da832b686eea0be926f65a.tar.gz
volse-hubzilla-cd47ba6ed1236b14c5da832b686eea0be926f65a.tar.bz2
volse-hubzilla-cd47ba6ed1236b14c5da832b686eea0be926f65a.zip
Merge branch 'pull'
-rw-r--r--view/theme/dispy-dark/style.css22
-rw-r--r--view/theme/dispy-dark/theme.php23
-rw-r--r--view/theme/dispy-dark/wall_item.tpl8
-rw-r--r--view/theme/dispy/style.css20
-rw-r--r--view/theme/dispy/theme.php21
-rw-r--r--view/theme/dispy/wall_item.tpl8
6 files changed, 44 insertions, 58 deletions
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 361648999..5dc0776e0 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -1031,6 +1031,7 @@ section {
font-size: 0.8em;
padding-right: 230px;
min-width: 475px;
+ width: 65%;
}
/** tabs **/
@@ -1161,10 +1162,18 @@ section {
transition: all 1s ease-in-out;
}
.wall-item-subtools1 {
- list-style: none;
+ height: 30px;
+ list-style: none outside none;
+ margin: 20px 0 30px -20px;
+ padding: 0;
+ width: 30px;
}
.wall-item-subtools2 {
- list-style: none;
+ height: 25px;
+ list-style: none outside none;
+ margin: -75px 0 0 5px;
+ padding: 0;
+ width: 25px;
}
.wall-item-title {
font-size: 1.2em;
@@ -1172,11 +1181,15 @@ section {
margin-bottom: 1em;
}
.wall-item-body {
- margin: 10px 10px 10px 0px;
+ margin: 20px 20px 10px 0px;
text-align: left;
}
.wall-item-lock-wrapper {
float: right;
+ height: 22px;
+ margin: 0 -5px 0 0;
+ width: 22px;
+ opacity: 1;
}
.wall-item-dislike,
.wall-item-like {
@@ -2141,8 +2154,7 @@ div[id$="wrapper"] br {
opacity: 0.1;
filter:alpha(opacity=10);
float: right;
- margin-right: 10px;
-
+ margin-right: 5px;
}
.item-select:hover, .checkeditem {
opacity: 1;
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index cebe9eb4f..7115faca1 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -6,14 +6,9 @@
* Version: 1.0
* Author: Simon <http://simon.kisikew.org/>
* Maintainer: Simon <http://simon.kisikew.org/>
- * Screenshot: <a href="screenshot.png">screenshot</a>
+ * Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/
-
-$a->theme_info = array(
- 'extends' => 'dispy-dark'
-);
-
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@@ -111,20 +106,6 @@ $(document).ready(function() {
$(this).css({color: '#eec'});
});
-/* $('#profile-photo-wrapper').mouseover(function() {
- $('.profile-edit-side-div').css({display: 'block'});
- }).mouseout(function() {
- $('.profile-edit-side-div').css({display: 'none'});
- return false;
- });
-
- $('img.photo').mouseover(function() {
- $('.profile-edit-side-div').css({display: 'block'});
- }).mouseout(function() {
- $('.profile-edit-side-div').css({display: 'none'});
- return false;
- });*/
-
});
</script>
EOT;
@@ -157,6 +138,6 @@ function dispydark_community_info() {
}
// aside on profile page
-if ($a->argv[0] === "profile") {
+if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispydark_community_info();
}
diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index 4b973bf93..b54f753d3 100644
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -16,11 +16,11 @@
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$item.id">
- <ul class="wall-item-subtools1">
- <li class="wall-item-lock-wrapper">
+ <div class="wall-item-lock-wrapper">
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
- </li>
+ </div>
+ <ul class="wall-item-subtools1">
{{ if $item.star }}
<li>
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
@@ -37,7 +37,7 @@
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</li>
{{ endif }}
- </ul>
+ </ul><br style="clear:left;" />
<ul class="wall-item-subtools2">
{{ if $item.filer }}
<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index c2c746767..1d6bba738 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1031,6 +1031,7 @@ section {
font-size: 0.8em;
padding-right: 230px;
min-width: 475px;
+ width: 65%;
}
/** tabs **/
@@ -1161,10 +1162,18 @@ section {
transition: all 1s ease-in-out;
}
.wall-item-subtools1 {
- list-style: none;
+ height: 30px;
+ list-style: none outside none;
+ margin: 20px 0 30px -20px;
+ padding: 0;
+ width: 30px;
}
.wall-item-subtools2 {
- list-style: none;
+ height: 25px;
+ list-style: none outside none;
+ margin: -75px 0 0 5px;
+ padding: 0;
+ width: 25px;
}
.wall-item-title {
font-size: 1.2em;
@@ -1172,11 +1181,15 @@ section {
margin-bottom: 1em;
}
.wall-item-body {
- margin: 10px 10px 10px 0px;
+ margin: 20px 20px 10px 0px;
text-align: left;
}
.wall-item-lock-wrapper {
float: right;
+ height: 22px;
+ margin: 0 -5px 0 0;
+ width: 22px;
+ opacity: 1;
}
.wall-item-dislike,
.wall-item-like {
@@ -2142,7 +2155,6 @@ div[id$="wrapper"] br {
filter:alpha(opacity=10);
float: right;
margin-right: 10px;
-
}
.item-select:hover, .checkeditem {
opacity: 1;
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 9789fd0fa..f3c54caf9 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -9,11 +9,6 @@
* Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/
-
-$a->theme_info = array(
- 'extends' => 'dispy'
-);
-
$a->page['htmlhead'] .= <<< EOT
<script>
$(document).ready(function() {
@@ -111,20 +106,6 @@ $(document).ready(function() {
$(this).css({color: '#eec'});
});
-/* $('#profile-photo-wrapper').mouseover(function() {
- $('.profile-edit-side-div').css({display: 'block'});
- }).mouseout(function() {
- $('.profile-edit-side-div').css({display: 'none'});
- return false;
- });
-
- $('img.photo').mouseover(function() {
- $('.profile-edit-side-div').css({display: 'block'});
- }).mouseout(function() {
- $('.profile-edit-side-div').css({display: 'none'});
- return false;
- });*/
-
});
</script>
EOT;
@@ -157,6 +138,6 @@ function dispy_community_info() {
}
// aside on profile page
-if ($a->argv[0] === "profile") {
+if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispy_community_info();
}
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 4b973bf93..b54f753d3 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -16,11 +16,11 @@
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$item.id">
- <ul class="wall-item-subtools1">
- <li class="wall-item-lock-wrapper">
+ <div class="wall-item-lock-wrapper">
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
- </li>
+ </div>
+ <ul class="wall-item-subtools1">
{{ if $item.star }}
<li>
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
@@ -37,7 +37,7 @@
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</li>
{{ endif }}
- </ul>
+ </ul><br style="clear:left;" />
<ul class="wall-item-subtools2">
{{ if $item.filer }}
<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>