tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge branch 'pull'

Browse source
This commit is contained in:
friendica 2012-03-29 18:23:34 -07:00
parent 75f778a504 1326c1388e
commit cd47ba6ed1
6 changed files with 44 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
view/theme/dispy-dark/style.css
View file

@ -1031,6 +1031,7 @@ section {
font-size: 0.8em; font-size: 0.8em;
padding-right: 230px; padding-right: 230px;
min-width: 475px; min-width: 475px;
width: 65%;
} }
/** tabs **/ /** tabs **/
@ -1161,10 +1162,18 @@ section {
transition: all 1s ease-in-out; transition: all 1s ease-in-out;
} }
.wall-item-subtools1 { .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 { .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 { .wall-item-title {
font-size: 1.2em; font-size: 1.2em;
@ -1172,11 +1181,15 @@ section {
margin-bottom: 1em; margin-bottom: 1em;
} }
.wall-item-body { .wall-item-body {
margin: 10px 10px 10px 0px; margin: 20px 20px 10px 0px;
text-align: left; text-align: left;
} }
.wall-item-lock-wrapper { .wall-item-lock-wrapper {
float: right; float: right;
height: 22px;
margin: 0 -5px 0 0;
width: 22px;
opacity: 1;
} }
.wall-item-dislike, .wall-item-dislike,
.wall-item-like { .wall-item-like {
@ -2141,8 +2154,7 @@ div[id$="wrapper"] br {
opacity: 0.1; opacity: 0.1;
filter:alpha(opacity=10); filter:alpha(opacity=10);
float: right; float: right;
margin-right: 10px; margin-right: 5px;
} }
.item-select:hover, .checkeditem { .item-select:hover, .checkeditem {
opacity: 1; opacity: 1;

23
view/theme/dispy-dark/theme.php
View file

@ -6,14 +6,9 @@
* Version: 1.0 * Version: 1.0
* Author: Simon <http://simon.kisikew.org/> * Author: Simon <http://simon.kisikew.org/>
* Maintainer: 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 $a->page['htmlhead'] .= <<< EOT
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@ -111,20 +106,6 @@ $(document).ready(function() {
$(this).css({color: '#eec'}); $(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> </script>
EOT; EOT;
@ -157,6 +138,6 @@ function dispydark_community_info() {
} }
// aside on profile page // aside on profile page
if ($a->argv[0] === "profile") { if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispydark_community_info(); dispydark_community_info();
} }

8
view/theme/dispy-dark/wall_item.tpl
View file

@ -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 class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div> </div>
<div class="wall-item-tools" id="wall-item-tools-$item.id"> <div class="wall-item-tools" id="wall-item-tools-$item.id">
<ul class="wall-item-subtools1"> <div class="wall-item-lock-wrapper">
<li 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> {{ 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 }} {{ else }}<div class="wall-item-lock"></div>{{ endif }}
</li> </div>
<ul class="wall-item-subtools1">
{{ if $item.star }} {{ if $item.star }}
<li> <li>
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a> <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;" /> <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</li> </li>
{{ endif }} {{ endif }}
</ul> </ul><br style="clear:left;" />
<ul class="wall-item-subtools2"> <ul class="wall-item-subtools2">
{{ if $item.filer }} {{ 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> <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>

20
view/theme/dispy/style.css
View file

@ -1031,6 +1031,7 @@ section {
font-size: 0.8em; font-size: 0.8em;
padding-right: 230px; padding-right: 230px;
min-width: 475px; min-width: 475px;
width: 65%;
} }
/** tabs **/ /** tabs **/
@ -1161,10 +1162,18 @@ section {
transition: all 1s ease-in-out; transition: all 1s ease-in-out;
} }
.wall-item-subtools1 { .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 { .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 { .wall-item-title {
font-size: 1.2em; font-size: 1.2em;
@ -1172,11 +1181,15 @@ section {
margin-bottom: 1em; margin-bottom: 1em;
} }
.wall-item-body { .wall-item-body {
margin: 10px 10px 10px 0px; margin: 20px 20px 10px 0px;
text-align: left; text-align: left;
} }
.wall-item-lock-wrapper { .wall-item-lock-wrapper {
float: right; float: right;
height: 22px;
margin: 0 -5px 0 0;
width: 22px;
opacity: 1;
} }
.wall-item-dislike, .wall-item-dislike,
.wall-item-like { .wall-item-like {
@ -2142,7 +2155,6 @@ div[id$="wrapper"] br {
filter:alpha(opacity=10); filter:alpha(opacity=10);
float: right; float: right;
margin-right: 10px; margin-right: 10px;
} }
.item-select:hover, .checkeditem { .item-select:hover, .checkeditem {
opacity: 1; opacity: 1;

21
view/theme/dispy/theme.php
View file

@ -9,11 +9,6 @@
* Screenshot: <a href="screenshot.jpg">Screenshot</a> * Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/ */
$a->theme_info = array(
'extends' => 'dispy'
);
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@ -111,20 +106,6 @@ $(document).ready(function() {
$(this).css({color: '#eec'}); $(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> </script>
EOT; EOT;
@ -157,6 +138,6 @@ function dispy_community_info() {
} }
// aside on profile page // aside on profile page
if ($a->argv[0] === "profile") { if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispy_community_info(); dispy_community_info();
} }

8
view/theme/dispy/wall_item.tpl
View file

@ -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 class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
</div> </div>
<div class="wall-item-tools" id="wall-item-tools-$item.id"> <div class="wall-item-tools" id="wall-item-tools-$item.id">
<ul class="wall-item-subtools1"> <div class="wall-item-lock-wrapper">
<li 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> {{ 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 }} {{ else }}<div class="wall-item-lock"></div>{{ endif }}
</li> </div>
<ul class="wall-item-subtools1">
{{ if $item.star }} {{ if $item.star }}
<li> <li>
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a> <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;" /> <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</li> </li>
{{ endif }} {{ endif }}
</ul> </ul><br style="clear:left;" />
<ul class="wall-item-subtools2"> <ul class="wall-item-subtools2">
{{ if $item.filer }} {{ 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> <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>