keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #221 from simonlnu/master

Browse source 
aaah, nice asides ;). we'll be updating these soon
This commit is contained in:
Simon 2012-04-10 02:50:42 -07:00
commit 9fafe64f82
11 changed files with 264 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
view/theme/dispy-dark/communityhome.tpl
View file

@ -37,10 +37,8 @@
</div> </div>
{{ endif }} {{ endif }}
{{ if $lastusers_title }} <h3 id="postit-header">'PostIt' to Friendica</h3>
<h3 id="postit-header">PostIt to Friendica</h3>
<div id="postit"> <div id="postit">
<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link. <a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
</div> </div>
{{ endif }}

9
view/theme/dispy-dark/default.php
View file

@ -7,13 +7,18 @@
</head> </head>
<body> <body>
<?php if(x($page,'nav')) echo $page['nav']; ?> <?php if(x($page,'nav')) echo $page['nav']; ?>
<aside> <aside id="asideleft">
<?php if(x($page,'aside')) echo $page['aside']; ?> <?php if(x($page,'aside')) echo $page['aside']; ?>
<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?> <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
</aside> </aside>
<section><?php if(x($page,'content')) echo $page['content']; ?> <section>
<?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>
<aside id="asideright">
<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
</aside>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body> </body>
</html> </html>

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

@ -2603,8 +2603,8 @@ div[id$="wrapper"] br {
} }
.icon.drop, .icon.drop,
.icon.drophide, .icon.delete { .icon.drophide, .icon.delete {
float: right; float: left;
margin: 5px; /*margin: 5px;*/
} }
.icon.s22.delete { .icon.s22.delete {
display: block; display: block;

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

@ -3,18 +3,27 @@
/* /*
* Name: Dispy Dark * Name: Dispy Dark
* Description: Dispy Dark, Friendica theme * Description: Dispy Dark, Friendica theme
* Version: 1.0 * Version: 1.1
* 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.jpg">Screenshot</a> * Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/ */
$a = get_app();
$a->theme_info = array( $a->theme_info = array(
'extends' => 'dispy-dark', 'name' => 'dispy-dark',
'version' => '1.1'
); );
function dispy_dark_init(&$a) {
// aside on profile page
if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispy_dark_community_info();
}
$a->page['htmlhead'] .= <<<EOT $a->page['htmlhead'] .= <<<EOT
<script> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$('.group-edit-icon').hover( $('.group-edit-icon').hover(
function() { function() {
@ -113,16 +122,16 @@ $(document).ready(function() {
}); });
</script> </script>
EOT; EOT;
}
function dispydark_community_info() { function dispy_dark_community_info() {
$a = get_app(); $a = get_app();
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
$aside['$lastusers_title'] = t('Last users'); $fpostitJS = <<<FPI
$aside['$lastusers_items'] = array(); javascript: (function() {
$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); the_url = ' . $url . '/view/theme/' . $a->theme_info['name'] . '/fpostit/fpostit.php?url=' +
$fostitJS = "javascript: (function() {
the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
document.getSelection() : document.selection.createRange().text)); document.getSelection() : document.selection.createRange().text));
@ -135,18 +144,11 @@ function dispydark_community_info() {
} else { } else {
a_funct(); a_funct();
} }
})();"; })();
FPI;
$aside['$fostitJS'] = $fostitJS;
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
$aside['$fpostitJS'] = $fpostitJS;
$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl'); $tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
$a->page['aside_bottom'] = replace_macros($tpl, $aside); return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
} }
// aside on profile page
//if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispydark_community_info();
//}

4
view/theme/dispy/communityhome.tpl
View file

@ -37,10 +37,8 @@
</div> </div>
{{ endif }} {{ endif }}
{{ if $lastusers_title }} <h3 id="postit-header">'PostIt' to Friendica</h3>
<h3 id="postit-header">PostIt to Friendica</h3>
<div id="postit"> <div id="postit">
<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link. <a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
</div> </div>
{{ endif }}

9
view/theme/dispy/default.php
View file

@ -7,13 +7,18 @@
</head> </head>
<body> <body>
<?php if(x($page,'nav')) echo $page['nav']; ?> <?php if(x($page,'nav')) echo $page['nav']; ?>
<aside> <aside id="asideleft">
<?php if(x($page,'aside')) echo $page['aside']; ?> <?php if(x($page,'aside')) echo $page['aside']; ?>
<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?> <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
</aside> </aside>
<section><?php if(x($page,'content')) echo $page['content']; ?> <section>
<?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>
<aside id="asideright">
<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
</aside>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body> </body>
</html> </html>

3
view/theme/dispy/nav.tpl
View file

@ -56,7 +56,6 @@ works -->
<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a> <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
</li> </li>
{{ endif }} {{ endif }}
{{ if $nav.contacts }} {{ if $nav.contacts }}
<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li> <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
{{ endif }} {{ endif }}
@ -75,11 +74,9 @@ works -->
{{ if $nav.admin }} {{ if $nav.admin }}
<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li> <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
{{ endif }} {{ endif }}
{{ if $nav.login }} {{ if $nav.login }}
<li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
{{ endif }} {{ endif }}
{{ if $nav.logout }} {{ if $nav.logout }}
<li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li> <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
{{ endif }} {{ endif }}

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

@ -2603,8 +2603,8 @@ div[id$="wrapper"] br {
} }
.icon.drop, .icon.drop,
.icon.drophide, .icon.delete { .icon.drophide, .icon.delete {
float: right; float: left;
margin: 5px; /*margin: 5px;*/
} }
.icon.s22.delete { .icon.s22.delete {
display: block; display: block;

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

@ -3,18 +3,27 @@
/* /*
* Name: Dispy * Name: Dispy
* Description: Dispy, Friendica theme * Description: Dispy, Friendica theme
* Version: 1.0 * Version: 1.1
* Author: unknown * Author: unknown
* Maintainer: Simon <http://simon.kisikew.org/> * Maintainer: Simon <http://simon.kisikew.org/>
* Screenshot: <a href="screenshot.jpg">Screenshot</a> * Screenshot: <a href="screenshot.jpg">Screenshot</a>
*/ */
$a = get_app();
$a->theme_info = array( $a->theme_info = array(
'extends' => 'dispy', 'name' => 'dispy',
'version' => '1.1'
); );
function dispy_init(&$a) {
// aside on profile page
if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispy_community_info();
}
$a->page['htmlhead'] .= <<<EOT $a->page['htmlhead'] .= <<<EOT
<script> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$('.group-edit-icon').hover( $('.group-edit-icon').hover(
function() { function() {
@ -113,12 +122,16 @@ $(document).ready(function() {
}); });
</script> </script>
EOT; EOT;
}
function dispy_community_info() { function dispy_community_info() {
$a = get_app(); $a = get_app();
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
$fostitJS = "javascript: (function() { $fpostitJS = <<<FPI
the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + javascript: (function() {
the_url = ' . $url . '/view/theme/' . $a->theme_info['name'] . '/fpostit/fpostit.php?url=' +
encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
document.getSelection() : document.selection.createRange().text)); document.getSelection() : document.selection.createRange().text));
@ -131,17 +144,11 @@ function dispy_community_info() {
} else { } else {
a_funct(); a_funct();
} }
})();"; })();
FPI;
$aside['$fostitJS'] = $fostitJS;
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
$aside['$fpostitJS'] = $fpostitJS;
$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl'); $tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
$a->page['aside_bottom'] = replace_macros($tpl, $aside); return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
} }
// aside on profile page
if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
dispy_community_info();
}

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

@ -4,9 +4,7 @@
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
</a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul> <ul>
@ -60,7 +58,8 @@
<div class="wall-item-content" id="wall-item-content-$item.id"> <div class="wall-item-content" id="wall-item-content-$item.id">
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
<div class="wall-item-title-end"></div> <div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body <div class="wall-item-body" id="wall-item-body-$item.id">
$item.body
<div class="body-tag"> <div class="body-tag">
{{ for $item.tags as $tag }} {{ for $item.tags as $tag }}
<span class='tag'>$tag</span> <span class='tag'>$tag</span>

9
view/theme/dispy/wallwall_item.tpl
View file

@ -2,15 +2,13 @@
<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info wallwall" id="wall-item-info-$item.id"> <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" > <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"> <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"><img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
</div> </div>
<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div> <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)"> onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"> <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span> <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id"> <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
<ul> <ul>
@ -66,7 +64,8 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
<div class="wall-item-content" id="wall-item-content-$item.id"> <div class="wall-item-content" id="wall-item-content-$item.id">
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div> <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
<div class="wall-item-title-end"></div> <div class="wall-item-title-end"></div>
<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body <div class="wall-item-body" id="wall-item-body-$item.id">
$item.body
<div class="body-tag"> <div class="body-tag">
{{ for $item.tags as $tag }} {{ for $item.tags as $tag }}
<span class="tag">$tag</span> <span class="tag">$tag</span>