MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge https://github.com/friendica/friendica into pull

Browse source
This commit is contained in:
friendica 2012-09-24 01:31:23 -07:00
commit 8df6f249fd
7 changed files with 88 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
view/theme/smoothly/search_item.tpl
View file

@ -1,3 +1,4 @@
<a name="$item.id" ></a>
<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
<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" id="wall-item-info-$item.id"> <div class="wall-item-info" id="wall-item-info-$item.id">
@ -34,7 +35,7 @@
</div> </div>
<div class="wall-item-author"> <div class="wall-item-author">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div> <div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
</div> </div>

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

@ -112,7 +112,7 @@ input[type=text] {
border: 1px solid #b0b0b0; border: 1px solid #b0b0b0;
padding: 2px; padding: 2px;
width: 575px; width: 575px;
margin-top: 10px; /*margin-top: 10px;*/
border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px;
-webkit-border-radius: 3px 3px 3px 3px; -webkit-border-radius: 3px 3px 3px 3px;
-moz-border-radius: 3px 3px 3px 3px; -moz-border-radius: 3px 3px 3px 3px;
@ -190,7 +190,7 @@ section {
} }
.mframe { .mframe {
padding: 2px; padding: 3px;
background: none repeat scroll 0 0 #FFFFFF; background: none repeat scroll 0 0 #FFFFFF;
border: 1px solid #C5C5C5; border: 1px solid #C5C5C5;
border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px;

9
view/theme/smoothly/theme.php
View file

@ -3,15 +3,19 @@
/* /*
* Name: Smoothly * Name: Smoothly
* Description: Like coffee with milk. Theme works fine with iPad[2]. * Description: Like coffee with milk. Theme works fine with iPad[2].
* Version: Version 0.9.20-3 * Version: Version 0.9.24-1
* Author: Alex <https://friendica.pixelbits.de/profile/alex> * Author: Alex <https://friendica.pixelbits.de/profile/alex>
* Maintainer: Alex <https://friendica.pixelbits.de/profile/alex> * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
* Screenshot: <a href="screenshot.png">Screenshot</a> * Screenshot: <a href="screenshot.png">Screenshot</a>
*/ */
$a = get_app();
$a->theme_info = array(); $a->theme_info = array();
function smoothly_init(&$a) { function smoothly_init(&$a) {
$cssFile = null;
$ssl_state = null;
$baseurl = $a->get_baseurl($ssl_state);
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<script> <script>
@ -95,7 +99,7 @@ $('.savedsearchterm').hover(
</script> </script>
EOT; EOT;
// custom css /** custom css **/
if (!is_null($cssFile)) { if (!is_null($cssFile)) {
$a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
} }
@ -109,6 +113,7 @@ if(! function_exists('_js_in_foot')) {
/** @purpose insert stuff in bottom of page /** @purpose insert stuff in bottom of page
*/ */
$a = get_app(); $a = get_app();
$ssl_state = null;
$baseurl = $a->get_baseurl($ssl_state); $baseurl = $a->get_baseurl($ssl_state);
$bottom['$baseurl'] = $baseurl; $bottom['$baseurl'] = $baseurl;
$tpl = file_get_contents(dirname(__file__) . '/bottom.tpl'); $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');

20
view/theme/smoothly/wall_item.tpl
View file

@ -39,6 +39,20 @@
<span class='tag'>$tag</span> <span class='tag'>$tag</span>
{{ endfor }} {{ endfor }}
</div> </div>
{{ if $item.has_cats }}
<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name
<a href="$cat.removeurl" title="$remove">[$remove]</a>
{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div>
{{ endif }}
{{ if $item.has_folders }}
<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name
<a href="$cat.removeurl" title="$remove">[$remove]</a>
{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div>
{{ endif }}
</div> </div>
</div> </div>
<div class="wall-item-social" id="wall-item-social-$item.id"> <div class="wall-item-social" id="wall-item-social-$item.id">
@ -83,8 +97,10 @@
</div> </div>
<div class="wall-item-author"> <div class="wall-item-author">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div> <span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
</a>
<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
</div> </div>
</div> </div>

17
view/theme/smoothly/wall_thread.tpl
View file

@ -46,7 +46,8 @@
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"> <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
<span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span> <span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
</a> </a>
<div class="wall-item-ago" id="wall-item-ago-$item.id">&bull; $item.ago</div> <div class="wall-item-ago">&bull;</div>
<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
</div> </div>
<div> <div>
@ -61,6 +62,20 @@
<span class='tag'>$tag</span> <span class='tag'>$tag</span>
{{ endfor }} {{ endfor }}
</div> </div>
{{ if $item.has_cats }}
<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name
<a href="$cat.removeurl" title="$remove">[$remove]</a>
{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div>
{{ endif }}
{{ if $item.has_folders }}
<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name
<a href="$cat.removeurl" title="$remove">[$remove]</a>
{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div>
{{ endif }}
</div> </div>
</div> </div>
<!-- <!--

16
view/theme/smoothly/wallwall_item.tpl
View file

@ -47,6 +47,20 @@
<span class='tag'>$tag</span> <span class='tag'>$tag</span>
{{ endfor }} {{ endfor }}
</div> </div>
{{ if $item.has_cats }}
<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name
<a href="$cat.removeurl" title="$remove">[$remove]</a>
{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div>
{{ endif }}
{{ if $item.has_folders }}
<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name
<a href="$cat.removeurl" title="$remove">[$remove]</a>
{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div>
{{ endif }}
</div> </div>
</div> </div>
@ -95,7 +109,7 @@
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"> <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
<span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span> <span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
</a> </a>
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div> <div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
</div> </div>
</div> </div>
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>

17
view/theme/smoothly/wallwall_thread.tpl
View file

@ -45,7 +45,8 @@
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"> <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
<span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span> <span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
</a> </a>
<div class="wall-item-ago" id="wall-item-ago-$item.id">&bull; $item.ago</div> <div class="wall-item-ago">&bull;</div>
<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
</div> </div>
<div> <div>
@ -59,6 +60,20 @@
<span class='tag'>$tag</span> <span class='tag'>$tag</span>
{{ endfor }} {{ endfor }}
</div> </div>
{{ if $item.has_cats }}
<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name
<a href="$cat.removeurl" title="$remove">[$remove]</a>
{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div>
{{ endif }}
{{ if $item.has_folders }}
<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name
<a href="$cat.removeurl" title="$remove">[$remove]</a>
{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
</div>
{{ endif }}
</div> </div>
</div> </div>
<div class="wall-item-social" id="wall-item-social-$item.id"> <div class="wall-item-social" id="wall-item-social-$item.id">