]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 816680c)
new file: view/theme/smoothly/default.php
authorpixelroot <info@pixelbits.de>
Mon, 17 Sep 2012 09:22:12 +0000 (11:22 +0200)
committerpixelroot <info@pixelbits.de>
Mon, 17 Sep 2012 09:22:12 +0000 (11:22 +0200)
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 [new file with mode: 0644] patch | blob
view/theme/smoothly/footer.tpl [new file with mode: 0644] patch | blob
view/theme/smoothly/header.tpl [new file with mode: 0644] patch | blob
view/theme/smoothly/nav.tpl patch | blob | history
view/theme/smoothly/style.css patch | blob | history
view/theme/smoothly/theme.php patch | blob | history

diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php
new file mode 100644 (file)
index 0000000..a136a82
--- /dev/null
+++ b/view/theme/smoothly/default.php
@@ -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>
+
diff --git a/view/theme/smoothly/footer.tpl b/view/theme/smoothly/footer.tpl
new file mode 100644 (file)
index 0000000..25058a7
--- /dev/null
+++ b/view/theme/smoothly/footer.tpl
@@ -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>
\ No newline at end of file
diff --git a/view/theme/smoothly/header.tpl b/view/theme/smoothly/header.tpl
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/view/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl
index 210b89a06fbc6183b72750d7cb09fc1e6cb3ad6d..e8fe3e93215e606dc285f5298ef8edbbde86fc8f 100644 (file)
--- a/view/theme/smoothly/nav.tpl
+++ b/view/theme/smoothly/nav.tpl
@@ -1,5 +1,12 @@
+<header>
+       <!-- 
+       <div id="site-location">$sitelocation</div>
+       <div id="banner">$banner</div>
+       -->
+</header>
+
 <nav>
-       $langselector
+       <!-- $langselector -->
 
        <span id="banner">$banner</span>
 
@@ -59,9 +66,11 @@
 </nav>
 
 <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>
 
 <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>
 </ul>
+
+<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div>
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index f5a4140b9c317486303abf2aa81e5d1991cbdd9d..852b966eb7058f48f423a515fba084f71fc9336f 100644 (file)
--- 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 edc549f9906e1e961ce814b5ea3505545a0c3b3f..5f8eaa4247bec396fd856caf28db37a2a30cfec2 100644 (file)
--- 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 <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>
@@ -94,4 +94,25 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
-}
\ No newline at end of file
+
+    // 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);
+       }
+}
Unnamed repository; edit this file 'description' to name the repository.