From cd3938dfdaf99c9978dfecf231ae1e29eb5fb737 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 17 Sep 2012 11:22:12 +0200 Subject: [PATCH] new file: view/theme/smoothly/default.php new file: view/theme/smoothly/footer.tpl new file: view/theme/smoothly/header.tpl modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php --- view/theme/smoothly/default.php | 30 ++++++++++++++++++++++++++++++ view/theme/smoothly/footer.tpl | 3 +++ view/theme/smoothly/header.tpl | 0 view/theme/smoothly/nav.tpl | 13 +++++++++++-- view/theme/smoothly/style.css | 24 +++++++++++------------- view/theme/smoothly/theme.php | 25 +++++++++++++++++++++++-- 6 files changed, 78 insertions(+), 17 deletions(-) create mode 100644 view/theme/smoothly/default.php create mode 100644 view/theme/smoothly/footer.tpl create mode 100644 view/theme/smoothly/header.tpl diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php new file mode 100644 index 00000000..a136a82d --- /dev/null +++ b/view/theme/smoothly/default.php @@ -0,0 +1,30 @@ + + + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + +
+ +
+ + + + + +
+
+
+ + + + + + + + + diff --git a/view/theme/smoothly/footer.tpl b/view/theme/smoothly/footer.tpl new file mode 100644 index 00000000..25058a7f --- /dev/null +++ b/view/theme/smoothly/footer.tpl @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/view/theme/smoothly/header.tpl b/view/theme/smoothly/header.tpl new file mode 100644 index 00000000..e69de29b diff --git a/view/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl index 210b89a0..e8fe3e93 100644 --- a/view/theme/smoothly/nav.tpl +++ b/view/theme/smoothly/nav.tpl @@ -1,5 +1,12 @@ +
+ +
+ + +
$langselector
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index f5a4140b..852b966e 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -96,7 +96,7 @@ li.widget-list { padding-left: 20px; margin-left: 20px; 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 { @@ -922,12 +922,9 @@ ul .sidebar-group-li .icon { } #jot-preview-link { - float: right; + float: left; width: 60px; /*height: 10px;*/ - margin-right: 180px; - /*margin-top: 0px; - margin-left: 10px;*/ font-size: 12px; 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% ); @@ -943,12 +940,12 @@ ul .sidebar-group-li .icon { } #profile-jot-perms { - width: 25px; + width: 27px; + height: 27px; float: right; overflow: hidden; margin-left: 10px; - margin-right: 80px; - margin-top: -28px; + margin-top: -20px; border: 1px solid #7C7D7B; border-radius: 5px 5px 5px 5px; } @@ -961,8 +958,9 @@ ul .sidebar-group-li .icon { width: 80px; float: right; margin-right: 90px; - margin-top: -28px; + margin-top: -20px; margin-left: 10px; + padding: 5px 5px; border: 1px solid #7C7D7B; border-radius: 5px 5px 5px 5px; } @@ -2643,7 +2641,7 @@ margin-left: 0px; background: url(login-bg.gif) no-repeat; background-position: 0 50%; padding-left: 18px; - width: 384px!important; + width: 220px!important; } #profile-tabs-wrapper { @@ -3273,8 +3271,8 @@ tr { /* =============== */ .field { - margin-bottom: 10px; - margin-top: 10px; + /*margin-bottom: 10px; + margin-top: 10px;*/ padding-bottom: 0px; width: 90%; } @@ -3807,6 +3805,6 @@ hr.line-dots { } /*div.wall-item-content-wrapper.shiny { - background-image: url("star.png"); + background-image: url("shiny.png"); background-repeat: no-repeat; }*/ diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index edc549f9..5f8eaa42 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 works fine with iPad[2]. - * Version: 0.7 + * Version: 0.8 * Author: Alex * Maintainer: Alex * Screenshot: Screenshot @@ -94,4 +94,25 @@ $('.savedsearchterm').hover( EOT; -} \ No newline at end of file + + // custom css + if (!is_null($cssFile)) { + $a->page['htmlhead'] .= sprintf('', $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); + } +}