diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php index 1326b0aca..b51692675 100644 --- a/include/friendica_smarty.php +++ b/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 "ERROR: folder view/smarty3/ must be writable by webserver."; killme(); + } + } + // ITemplateEngine interface public function replace_macros($s, $r) { $template = ''; diff --git a/view/theme/smoothly/css/typography.css b/view/theme/smoothly/css/typography.css index 074bd9816..d1895853e 100644 --- a/view/theme/smoothly/css/typography.css +++ b/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; diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php index 867073f0c..9ac49820a 100644 --- a/view/theme/smoothly/default.php +++ b/view/theme/smoothly/default.php @@ -26,13 +26,18 @@ + + + + + diff --git a/view/theme/smoothly/images/down.png b/view/theme/smoothly/images/down.png index ab6f9fd49..4c320184b 100644 Binary files a/view/theme/smoothly/images/down.png and b/view/theme/smoothly/images/down.png differ diff --git a/view/theme/smoothly/images/power.png b/view/theme/smoothly/images/power.png new file mode 100644 index 000000000..2541502c3 Binary files /dev/null and b/view/theme/smoothly/images/power.png differ diff --git a/view/theme/smoothly/images/up.png b/view/theme/smoothly/images/up.png new file mode 100644 index 000000000..31a01644d Binary files /dev/null and b/view/theme/smoothly/images/up.png differ diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index bf7e639e0..476cd980e 100644 --- a/view/theme/smoothly/style.css +++ b/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 {} diff --git a/view/theme/smoothly/templates/tools.tpl b/view/theme/smoothly/templates/tools.tpl new file mode 100644 index 000000000..fc7a68c5e --- /dev/null +++ b/view/theme/smoothly/templates/tools.tpl @@ -0,0 +1,11 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index 76b3abc90..9c4c7ca33 100644 --- a/view/theme/smoothly/theme.php +++ b/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