clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #480 from pixelroot/master 

Bug fixes
This commit is contained in:
Alex 2012-09-17 02:20:07 -07:00
parent 640f5306f5 cd3938dfda
commit 06c9330c5e
6 changed files with 78 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
view/theme/smoothly/default.php Normal file
View File

@ -0,0 +1,30 @@
<!DOCTYPE html >
<html>
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
<header>
<?php if(x($page, 'header')) echo $page['header']; ?>
</header>
<?php if(x($page,'nav')) echo $page['nav']; ?>
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
<section><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div>
</section>
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
<footer id="footer">
<?php if(x($page, 'footer')) echo $page['footer']; ?>
</footer>
<?php if (x($page, 'bottom')) echo $page['bottom']; ?>
</body>
</html>

3
view/theme/smoothly/footer.tpl Normal file
View File

@ -0,0 +1,3 @@
<div id="footerbox" style="display:none">
<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
</div>

0
view/theme/smoothly/header.tpl Normal file
View File

13
view/theme/smoothly/nav.tpl
View File

@ -1,5 +1,12 @@
<header>
<!--
<div id="site-location">$sitelocation</div>
<div id="banner">$banner</div>
-->
</header>
<nav> <nav>
$langselector <!-- $langselector -->
<span id="banner">$banner</span> <span id="banner">$banner</span>
@ -59,9 +66,11 @@
</nav> </nav>
<div id="scrollup" > <div id="scrollup" >
<a href="#top"><img src="view/theme/smoothly/totop.png" alt="back to top" title="Back to top" /></a> <a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/totop.png" alt="back to top" title="Back to top" /></a>
</div> </div>
<ul id="nav-notifications-template" style="display:none;" rel="template"> <ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li> <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
</ul> </ul>
<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div>

24
view/theme/smoothly/style.css
View File

@ -96,7 +96,7 @@ li.widget-list {
padding-left: 20px; padding-left: 20px;
margin-left: 20px; margin-left: 20px;
margin-bottom: 10px; margin-bottom: 10px;
background: url("down.png") no-repeat scroll left center transparent; /*background: url("down.png") no-repeat scroll left center transparent;*/
} }
.fakelink :hover { .fakelink :hover {
@ -922,12 +922,9 @@ ul .sidebar-group-li .icon {
} }
#jot-preview-link { #jot-preview-link {
float: right; float: left;
width: 60px; width: 60px;
/*height: 10px;*/ /*height: 10px;*/
margin-right: 180px;
/*margin-top: 0px;
margin-left: 10px;*/
font-size: 12px; font-size: 12px;
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
@ -943,12 +940,12 @@ ul .sidebar-group-li .icon {
} }
#profile-jot-perms { #profile-jot-perms {
width: 25px; width: 27px;
height: 27px;
float: right; float: right;
overflow: hidden; overflow: hidden;
margin-left: 10px; margin-left: 10px;
margin-right: 80px; margin-top: -20px;
margin-top: -28px;
border: 1px solid #7C7D7B; border: 1px solid #7C7D7B;
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
} }
@ -961,8 +958,9 @@ ul .sidebar-group-li .icon {
width: 80px; width: 80px;
float: right; float: right;
margin-right: 90px; margin-right: 90px;
margin-top: -28px; margin-top: -20px;
margin-left: 10px; margin-left: 10px;
padding: 5px 5px;
border: 1px solid #7C7D7B; border: 1px solid #7C7D7B;
border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px;
} }
@ -2643,7 +2641,7 @@ margin-left: 0px;
background: url(login-bg.gif) no-repeat; background: url(login-bg.gif) no-repeat;
background-position: 0 50%; background-position: 0 50%;
padding-left: 18px; padding-left: 18px;
width: 384px!important; width: 220px!important;
} }
#profile-tabs-wrapper { #profile-tabs-wrapper {
@ -3273,8 +3271,8 @@ tr {
/* =============== */ /* =============== */
.field { .field {
margin-bottom: 10px; /*margin-bottom: 10px;
margin-top: 10px; margin-top: 10px;*/
padding-bottom: 0px; padding-bottom: 0px;
width: 90%; width: 90%;
} }
@ -3807,6 +3805,6 @@ hr.line-dots {
} }
/*div.wall-item-content-wrapper.shiny { /*div.wall-item-content-wrapper.shiny {
background-image: url("star.png"); background-image: url("shiny.png");
background-repeat: no-repeat; background-repeat: no-repeat;
}*/ }*/

23
view/theme/smoothly/theme.php
View File

@ -3,7 +3,7 @@
/* /*
* 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: 0.7 * Version: 0.8
* 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>
@ -94,4 +94,25 @@ $('.savedsearchterm').hover(
</script> </script>
EOT; EOT;
// custom css
if (!is_null($cssFile)) {
$a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
}
_js_in_foot();
}
if(! function_exists('_js_in_foot')) {
function _js_in_foot() {
/** @purpose insert stuff in bottom of page
*/
$a = get_app();
$baseurl = $a->get_baseurl($ssl_state);
$bottom['$baseurl'] = $baseurl;
$tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
return $a->page['bottom'] = replace_macros($tpl, $bottom);
}
} }