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

include/friendica_smarty.php

@@ -45,6 +45,13 @@ class FriendicaSmarty extends Smarty {
 
 class FriendicaSmartyEngine implements ITemplateEngine {
 	static $name ="smarty3";
+   	
+    public function __construct(){
+		if(!is_writable('view/smarty3/')){
+			echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver."; killme();
+		}
+	} 
+    
 	// ITemplateEngine interface
 	public function replace_macros($s, $r) {
 		$template = '';

view/theme/smoothly/css/typography.css

@@ -19,7 +19,7 @@ body {
 	padding-bottom: 3em;
 	width: 960px;
 	height: 100%;
-	font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif;
+	font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;
 	font-size: 15px;
 	font-size-adjust: none;
 	font-style: normal;

view/theme/smoothly/default.php

@@ -26,13 +26,18 @@
 	<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']; ?>
-		<div id="scrollup" >
-		<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a>
-		<a href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
-		</div>
+	<?php if(x($page, 'footer')) echo $page['footer']; ?>
 	</footer>
 
+	<tools id="tools">
+	<?php if (x($page, 'tools')) echo $page['tools']; ?>
+	<div id="scrollup" >
+	<a class="item-scrollup" href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/down.png" alt="to bottom" title="to bottom" /></a>
+	<a class="item-scrollup" href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/up.png" alt="to top" title="to top" /></a>
+	<a class="item-scrollup" href="logout"><img src="view/theme/smoothly/images/power.png" alt="power" title="power" /></a>
+	</div>
+	</tools>
+
 	<?php if (x($page, 'bottom')) echo $page['bottom']; ?>
 </body>
 </html>

view/theme/smoothly/style.css

@@ -2,7 +2,7 @@
   	style.css
   	Theme: Smoothly
 	Maintainer: alex@friendica.pixelbits.de
-	last change: 2013-04-24
+	last change: 2013-05-08
 
 ** Colors ** 
 Blue links - #1873a2
@@ -574,14 +574,14 @@ ul#user-menu-popup li a.nav-sep {
 #lang-select-icon {
 	bottom: 5px;
 	cursor: pointer;
-	left: 915px;
+	left: 25px;
 	position: fixed;
 	z-index: 10;
 }
 #language-selector {
 	position: fixed;
 	bottom: 2px;
-	left: 945px;
+	left: 55px;
 	z-index: 10;
 }
 
@@ -639,6 +639,12 @@ aside h4 {
 	font-size: 1.3em;
 }
 
+.vcard  {
+	width: 205px;
+	padding-bottom: 10px;
+	/*border-bottom-style: dotted;*/
+}
+
 .vcard .title {
 	font-size: 1em;
 }
@@ -1032,8 +1038,8 @@ ul .sidebar-group-li .icon {
 /* ================== */
 
 .contact-block-img {
-	width: 47px;
-	height: 47px;
+	width: 47px !important;
+	height: 47px !important;
 	margin-right: 2px;
 	border: 1px solid #7C7D7B;
 	border-radius: 3px;
@@ -1061,11 +1067,13 @@ ul .sidebar-group-li .icon {
 .contact-block-h4,
 .contact-block-content {
 	margin: 0;
+	font-size: 1.2em;
 }
 
 #contact-block,
 #contact-block-end {
 	clear: both;
+	padding-top: 10px;
 }
 
 /* ======= */
@@ -3739,7 +3747,7 @@ margin-left: 0px;
 
 .field label {
     float: left;
-    width: 225px;
+    width: 230px;
 }
 
 .field checkbox {
@@ -3925,7 +3933,13 @@ margin-left: 0px;
 	font-size: 0.7em; 
 }
 
-footer {
+footer { display: block; margin: 50px 20%; clear: both; }
+
+/* ========== */
+/* = Tools = */
+/* ========== */
+
+tools {
 	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f0edf0), color-stop(1, #e2e2e2) );
 	background: -moz-linear-gradient( center top, #f0edf0 5%, #e2e2e2 100% );
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0edf0', endColorstr='#e2e2e2');
@@ -3942,7 +3956,7 @@ footer {
 	display: block;
 	float: right;
 	font-size: 15px;
-	height: 2em;
+	height: 38px;
 	list-style: none outside none;
 	margin: 0 0 0 755px;
 	padding: 0;
@@ -3953,7 +3967,6 @@ footer {
 	clear:both;
 }
 
-
 /* ======= */
 /* = ACL = */
 /* ======= */
@@ -4322,9 +4335,10 @@ ul.menu-popup {
 ----------------------------------------------------------- */
 #scrollup {
 	position: absolute;
-	right: 70px;
-	bottom: -4px;
+	right: 0px;
+	bottom: -1px;
 	z-index: 100;
+padding-right: 10px;
 }
 
 #scrollup a:hover {
@@ -4332,6 +4346,10 @@ ul.menu-popup {
 	border: 0;
 }
 
+.item-scrollup {
+	margin-left: 5px;
+}
+
 /* New posts and comments => background color
 ----------------------------------------------------------- */
 .shiny {
@@ -4426,6 +4444,7 @@ hr.line-dots {
 	float: left;
 	text-align: left;
 	display: block;
+	line-height: 0.6em;
 }
 
 .adr, 
@@ -4435,6 +4454,8 @@ hr.line-dots {
 	float: left;
 	display: block;
 	margin-left: 8px;
+	line-height: 1em;
+	text-align: left;
 }
 
 #birthday-notice {}

view/theme/smoothly/templates/tools.tpl

@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+</nav>

view/theme/smoothly/theme.php

@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme optimized for iPad[2].
- * Version: Version 2013-04-24
+ * Version: Version 2013-05-08.2
  * Author: Anne Walk
  * Author: Devlon Duthied
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>