]> git.mxchange.org Git - friendica.git/commitdiff
add possibility to load custom page templates + none.php pagetemplate is part of...
authorrabuzarus <>
Mon, 11 Jul 2016 08:33:39 +0000 (10:33 +0200)
committerrabuzarus <>
Mon, 11 Jul 2016 08:33:39 +0000 (10:33 +0200)
25 files changed:
include/acl_selectors.php
include/plugin.php
index.php
js/autocomplete.js
view/default.php [deleted file]
view/minimal.php [deleted file]
view/php/default.php [new file with mode: 0644]
view/php/minimal.php [new file with mode: 0644]
view/php/none.php [new file with mode: 0644]
view/theme/decaf-mobile/default.php [deleted file]
view/theme/decaf-mobile/php/default.php [new file with mode: 0644]
view/theme/dispy/default.php [deleted file]
view/theme/dispy/php/default.php [new file with mode: 0644]
view/theme/frio/default.php [deleted file]
view/theme/frio/php/default.php [new file with mode: 0644]
view/theme/frio/php/modes/default.php [deleted file]
view/theme/frio/php/modes/none.php [deleted file]
view/theme/frio/php/modes/standard.php [deleted file]
view/theme/frio/php/standard.php [new file with mode: 0644]
view/theme/frost-mobile/default.php [deleted file]
view/theme/frost-mobile/php/default.php [new file with mode: 0644]
view/theme/frost/default.php [deleted file]
view/theme/frost/php/default.php [new file with mode: 0644]
view/theme/smoothly/default.php [deleted file]
view/theme/smoothly/php/default.php [new file with mode: 0644]

index fc3df52327103d6fa56ce18936af685eceb6b4a9..76f0e0b79609caf74d9c1a68bd11f0bea209b654 100644 (file)
@@ -399,7 +399,7 @@ function acl_lookup(&$a, $out_type = 'json') {
        $count  =       (x($_REQUEST,'count')           ? $_REQUEST['count']            : 100);
        $search  =      (x($_REQUEST,'search')          ? $_REQUEST['search']           : "");
        $type   =       (x($_REQUEST,'type')            ? $_REQUEST['type']             : "");
-       $mode   =       (x($_REQUEST,'mode')            ? $_REQUEST['mode']             : "");
+       $mode   =       (x($_REQUEST,'smode')           ? $_REQUEST['smode']            : "");
        $conv_id =      (x($_REQUEST,'conversation')    ? $_REQUEST['conversation']     : null);
 
        // For use with jquery.textcomplete for private mail completion
@@ -690,7 +690,7 @@ function navbar_complete(&$a) {
        $localsearch = get_config('system','poco_local_search');
 
        $search = $prefix.notags(trim($_REQUEST['search']));
-       $mode = $_REQUEST['mode'];
+       $mode = $_REQUEST['smode'];
 
        // don't search if search term has less than 2 characters
        if(! $search || mb_strlen($search) < 2)
index 2cb94b3504b3989377f1bbbd30aa9f3ef9b50de5..e2bd23ee2a2ba97438ec913f80cad7abb1e44658 100644 (file)
@@ -534,3 +534,41 @@ function upgrade_bool_message($bbcode = false) {
        $x = upgrade_link($bbcode);
        return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ;
 }
+
+/**
+ * @brief Get the full path to relevant theme files by filename
+ * 
+ * This function search in the theme directory (and if not present in global theme directory)
+ * if there is a directory with the file extension and  for a file with the given
+ * filename. 
+ * 
+ * @param string $file Filename
+ * @param string $root Full root path
+ * @return string Path to the file or empty string if the file isn't found
+ */
+function theme_include($file, $root = '') {
+       // Make sure $root ends with a slash / if it's not blank
+       if($root !== '' && $root[strlen($root)-1] !== '/')
+               $root = $root . '/';
+       $theme_info = $a->theme_info;
+       if(array_key_exists('extends',$theme_info))
+               $parent = $theme_info['extends'];
+       else
+               $parent = 'NOPATH';
+       $theme = current_theme();
+       $thname = $theme;
+       $ext = substr($file,strrpos($file,'.')+1);
+       $paths = array(
+               "{$root}view/theme/$thname/$ext/$file",
+               "{$root}view/theme/$parent/$ext/$file",
+               "{$root}view/$ext/$file",
+       );
+       foreach($paths as $p) {
+               // strpos() is faster than strstr when checking if one string is in another (http://php.net/manual/en/function.strstr.php)
+               if(strpos($p,'NOPATH') !== false)
+                       continue;
+               if(file_exists($p))
+                       return $p;
+       }
+       return '';
+}
\ No newline at end of file
index 7b41403351610a8f8d899ee622c071ea120e8ead..6ce348eac5d57692881c47e11f1d913df9567b40 100644 (file)
--- a/index.php
+++ b/index.php
@@ -500,21 +500,19 @@ $profile = $a->profile;
 header("X-Friendica-Version: ".FRIENDICA_VERSION);
 header("Content-type: text/html; charset=utf-8");
 
+// We use $_GET["mode"] for special page templates. So we will check if we have 
+// to load another page template than the default one
+// The page templates are located in /view/php/ or in the theme directory
+if (isset($_GET["mode"])) {
+               $template = theme_include($_GET["mode"].'.php');
+}
 
-if (isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) {
-       //$page['content'] = substr($target->saveHTML(), 6, -8)."\n\n".
-       //                      '<div id="conversation-end"></div>'."\n\n";
-
-       require "view/minimal.php";
-} else {
-       $template = 'view/theme/' . current_theme() . '/'
-               . ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
-
-       if(file_exists($template))
-               require_once($template);
-       else
-               require_once(str_replace('theme/' . current_theme() . '/', '', $template));
+// If there is no page template use the default page template
+if(!$template) {
+       $template = theme_include("default.php");
 }
 
+require_once($template);
+
 session_write_close();
 exit;
index 8020478722413cf47937e6f88d6268cccabb62b3..d0c770cc4bcd313d237fa554732105c78e9e2d08 100644 (file)
@@ -41,7 +41,7 @@ function contact_search(term, callback, backend_url, type, mode) {
                postdata['conversation'] = conv_id[0];
 
        if(mode !== null)
-               postdata['mode'] = mode;
+               postdata['smode'] = mode;
 
 
        $.ajax({
diff --git a/view/default.php b/view/default.php
deleted file mode 100644 (file)
index df9adbc..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html >\r
-<html itemscope itemtype="http://schema.org/Blog" lang="<?php echo $lang; ?>">\r
-<head>\r
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>\r
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
-</head>\r
-<body>\r
-       <?php if(x($page,'nav')) echo $page['nav']; ?>\r
-       <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>\r
-       <section>\r
-               <?php if(x($page,'content')) echo $page['content']; ?>\r
-               <div id="pause"></div> <!-- The pause/resume Ajax indicator -->\r
-               <div id="page-footer"></div>\r
-       </section>\r
-       <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>\r
-       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
-</body>\r
-</html>\r
diff --git a/view/minimal.php b/view/minimal.php
deleted file mode 100644 (file)
index a131e3e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html >\r
-<html>\r
-<head>\r
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>\r
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
-</head>\r
-<body>\r
-       <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>\r
-               <div id="page-footer"></div>\r
-       </section>\r
-</body>\r
-</html>\r
-\r
diff --git a/view/php/default.php b/view/php/default.php
new file mode 100644 (file)
index 0000000..df9adbc
--- /dev/null
@@ -0,0 +1,19 @@
+<!DOCTYPE html >\r
+<html itemscope itemtype="http://schema.org/Blog" lang="<?php echo $lang; ?>">\r
+<head>\r
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>\r
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
+</head>\r
+<body>\r
+       <?php if(x($page,'nav')) echo $page['nav']; ?>\r
+       <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>\r
+       <section>\r
+               <?php if(x($page,'content')) echo $page['content']; ?>\r
+               <div id="pause"></div> <!-- The pause/resume Ajax indicator -->\r
+               <div id="page-footer"></div>\r
+       </section>\r
+       <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>\r
+       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
+</body>\r
+</html>\r
diff --git a/view/php/minimal.php b/view/php/minimal.php
new file mode 100644 (file)
index 0000000..a131e3e
--- /dev/null
@@ -0,0 +1,14 @@
+<!DOCTYPE html >\r
+<html>\r
+<head>\r
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>\r
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
+</head>\r
+<body>\r
+       <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>\r
+               <div id="page-footer"></div>\r
+       </section>\r
+</body>\r
+</html>\r
+\r
diff --git a/view/php/none.php b/view/php/none.php
new file mode 100644 (file)
index 0000000..5b96e28
--- /dev/null
@@ -0,0 +1,11 @@
+<?php\r
+/**\r
+ * @file view/theme/frio/php/modes/none.php\r
+ * @brief The site template for pure content (e.g. (modals)\r
+ * \r
+ * This themplate is used e.g for bs modals. So outputs\r
+ * only the pure content\r
+ */\r
+\r
+if(x($page,'content')) echo $page['content'];\r
+\r
diff --git a/view/theme/decaf-mobile/default.php b/view/theme/decaf-mobile/default.php
deleted file mode 100644 (file)
index ad46476..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html >\r
-<html>\r
-<head>\r
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>\r
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
-</head>\r
-<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>\r
-       <?php if(x($page,'nav')) echo $page['nav']; ?>\r
-\r
-       <?php if( $a->module === 'home' ) { ?>\r
-       <center>\r
-       <div class="login-button">\r
-       <a href="login" class="login-button-link"><img class="login-button-image" src="images/friendica-1600.png" title="Click to log in"></a>\r
-       </div>\r
-       </center>\r
-\r
-       <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {\r
-       ?>\r
-       <div class='section-wrapper'>\r
-       <section><?php if(x($page,'content')) echo $page['content']; ?>\r
-       </section>\r
-       </div>\r
-       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
-\r
-       <?php } else { ?>\r
-       <div class='main-container'>\r
-<!--           <div class='main-content-container'>-->\r
-               <div class='section-wrapper'>\r
-               <?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>\r
-               <section><?php if(x($page,'content')) echo $page['content']; ?>\r
-                       <div id="page-footer"></div>\r
-               </section>\r
-               </div>\r
-               <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>\r
-               <?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>\r
-               <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
-<!--           </div>-->\r
-       </div>\r
-       <?php } ?>\r
-       <?php if(x($page,'end')) echo $page['end']; ?>\r
-</body>\r
-</html>\r
-\r
diff --git a/view/theme/decaf-mobile/php/default.php b/view/theme/decaf-mobile/php/default.php
new file mode 100644 (file)
index 0000000..ad46476
--- /dev/null
@@ -0,0 +1,44 @@
+<!DOCTYPE html >\r
+<html>\r
+<head>\r
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>\r
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
+</head>\r
+<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>\r
+       <?php if(x($page,'nav')) echo $page['nav']; ?>\r
+\r
+       <?php if( $a->module === 'home' ) { ?>\r
+       <center>\r
+       <div class="login-button">\r
+       <a href="login" class="login-button-link"><img class="login-button-image" src="images/friendica-1600.png" title="Click to log in"></a>\r
+       </div>\r
+       </center>\r
+\r
+       <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {\r
+       ?>\r
+       <div class='section-wrapper'>\r
+       <section><?php if(x($page,'content')) echo $page['content']; ?>\r
+       </section>\r
+       </div>\r
+       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
+\r
+       <?php } else { ?>\r
+       <div class='main-container'>\r
+<!--           <div class='main-content-container'>-->\r
+               <div class='section-wrapper'>\r
+               <?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>\r
+               <section><?php if(x($page,'content')) echo $page['content']; ?>\r
+                       <div id="page-footer"></div>\r
+               </section>\r
+               </div>\r
+               <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>\r
+               <?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>\r
+               <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
+<!--           </div>-->\r
+       </div>\r
+       <?php } ?>\r
+       <?php if(x($page,'end')) echo $page['end']; ?>\r
+</body>\r
+</html>\r
+\r
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php
deleted file mode 100644 (file)
index c3e6c91..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<!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>
-       <article id="articlemain">
-               <header id="articleheader">
-                       <?php if(x($page, 'articleheader')) echo $page['articleheader']; ?>
-               </header>
-               <?php if(x($page,'nav')) echo $page['nav']; ?>
-               <aside id="asideleft">
-                       <?php if(x($page,'aside_left')) echo $page['aside_left']; ?>
-                       <?php if(x($page,'aside_left_bottom')) echo $page['aside_left_bottom']; ?>
-               </aside>
-               <section id="sectionmain">
-                       <?php if(x($page,'content')) echo $page['content']; ?>
-                       <footer id="sectionfooter">
-                       </footer>
-               </section>
-               <aside id="asidemain">
-                       <?php if(x($page,'aside')) echo $page['aside']; ?>
-                       <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
-               </aside>
-               <aside id="asideright">
-                       <?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
-                       <?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
-               </aside>
-               <footer id="articlefooter">
-                       <?php if(x($page, 'articlefooter')) echo $page['articlefooter']; ?>
-               </footer>
-       </article>
-       <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/dispy/php/default.php b/view/theme/dispy/php/default.php
new file mode 100644 (file)
index 0000000..c3e6c91
--- /dev/null
@@ -0,0 +1,44 @@
+<!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>
+       <article id="articlemain">
+               <header id="articleheader">
+                       <?php if(x($page, 'articleheader')) echo $page['articleheader']; ?>
+               </header>
+               <?php if(x($page,'nav')) echo $page['nav']; ?>
+               <aside id="asideleft">
+                       <?php if(x($page,'aside_left')) echo $page['aside_left']; ?>
+                       <?php if(x($page,'aside_left_bottom')) echo $page['aside_left_bottom']; ?>
+               </aside>
+               <section id="sectionmain">
+                       <?php if(x($page,'content')) echo $page['content']; ?>
+                       <footer id="sectionfooter">
+                       </footer>
+               </section>
+               <aside id="asidemain">
+                       <?php if(x($page,'aside')) echo $page['aside']; ?>
+                       <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
+               </aside>
+               <aside id="asideright">
+                       <?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
+                       <?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
+               </aside>
+               <footer id="articlefooter">
+                       <?php if(x($page, 'articlefooter')) echo $page['articlefooter']; ?>
+               </footer>
+       </article>
+       <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/frio/default.php b/view/theme/frio/default.php
deleted file mode 100644 (file)
index 0faa7d9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php 
-
-/**
- * @file view/theme/frio/default.php
- * 
- * @brief load site template in dependence of the mode
- *     You will find the site templates under:
- *     {{?themepath}}/php/modes/
- */
-require_once('view/theme/frio/php/frio_boot.php');
-
-
-// Check if page is defined as model and set it as modal
-// This is a workaround, where we can't change the page the
-// page mode in the template with javascript
-$page_type = get_page_type($a->argv[0]);
-
-// This is uncommented because we don't need it anymore.
-// We try to to use links which resulting in $_GET["mode"] = "none"
-//if($page_type === "none") {
-//     $_GET["mode"] = "none";
-//}
-
-if((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) {
-
-       require "view/theme/frio/php/modes/none.php";
-} elseif($page_type === "standard_page") {
-       require "view/theme/frio/php/modes/standard.php";
-} else {
-       require "view/theme/frio/php/modes/default.php";
-}
-
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
new file mode 100644 (file)
index 0000000..6f9c1a4
--- /dev/null
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @file view/theme/frio/php/modes/default.php
+ * @brief The default site template
+ */
+?>
+
+<!DOCTYPE html >
+
+<?php 
+       require_once('view/theme/frio/php/frio_boot.php');
+
+//     $minimal = is_modal();
+
+?>
+
+<html>
+<head>
+       <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+       <meta request="<?php echo $_REQUEST['pagename'] ?> ">
+       <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+       <script>var frio="<?php echo "view/theme/frio"; ?>";</script>
+       <?php $baseurl = $a->get_baseurl(); ?>
+       <?php $frio = "view/theme/frio"; ?>
+       <?php 
+               // Because we use minimal for modals the header and the included js stuff should be only loaded
+               // if the page is an standard page (so we don't have it twice for modals)
+               // 
+               /// @todo Think about to move js stuff in the footer
+               if(!$minimal) {
+                       if(x($page,'htmlhead')) echo $page['htmlhead'];
+               }
+       ?>
+       
+
+</head>
+<?php
+if(($_SERVER['REQUEST_URI'] != "/register") && ($_SERVER['REQUEST_URI'] != "/lostpass") && ($_SERVER['REQUEST_URI'] != "/login"))
+{
+       echo"<body id=\"top\">";
+}
+else
+{
+       echo"<body id=\"top\">";
+}
+?>
+<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+<?php
+       if(x($page,'nav') && (!$minimal)){
+       echo    str_replace("~config.sitename~",get_config('config','sitename'),
+                       str_replace("~system.banner~",get_config('system','banner'),
+                       $page['nav']
+       ));};
+
+       // special minimal style for modal dialogs
+       if($minimal) {
+?>
+               <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>
+                       <div id="page-footer"></div>
+               </section>
+<?php  }
+       // the style for all other pages
+       else {
+?>     <main>
+               <div class="container">
+                       <div class="row">
+<?php
+                               if(($_REQUEST['pagename'] != "register") && ($_REQUEST['pagename'] != "lostpass") && ($_REQUEST['pagename'] != "login") && ($_SERVER['REQUEST_URI'] != "/"))
+                               {
+                                       echo"
+                                       <aside class=\"col-lg-3 col-md-3 offcanvas-sm offcanvas-xs\">
+                                               "; if(x($page,'aside')) echo $page['aside']; echo"
+                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
+                                       </aside>
+
+                                       <!-- The following paragraph can maybe deleted because we don't need it anymore -->
+                                       <div id=\"NavAside\" class=\"navmenu navmenu-default navmenu-fixed-left offcanvas hidden-lg hidden-md\">
+                                               <div class=\"nav-container\">
+                                                       <div class=\"list-group\">
+                                                               "; if(x($page,'aside')) echo $page['aside']; echo"
+                                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
+                                                       </div>
+                                               </div>
+                                       </div><!--/.sidebar-offcanvas-->
+
+                                       <div class=\"col-lg-7 col-md-7 col-sm-12 col-xs-12\" id=\"content\">
+                                               <section class=\"sectiontop "; echo $a->argv[0]; echo "-content-wrapper\">";
+                                                               if(x($page,'content')) echo $page['content']; echo"
+                                                               <div id=\"pause\"></div> <!-- The pause/resume Ajax indicator -->
+                                               </section>
+                                       </div>
+                                               ";
+                               }
+                               else
+                               {
+                                       echo"
+                                       <div class=\"col-lg-12 col-md-12 col-sm-12 col-xs-12\" id=\"content\" style=\"margin-top:50px;\" >
+                                               "; if(x($page,'content')) echo $page['content']; echo"
+                                       </div>
+                                       ";
+                               }
+?>
+               
+                       </div><!--row-->
+               </div><!-- container -->
+
+               <div id="back-to-top" title="back to top">&#8679;</div>
+       </main>
+
+<footer>
+<?php if(x($page,'footer')) echo $page['footer']; ?>
+<!-- Modal  -->
+<div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="plan-info" aria-hidden="true">
+       <div class="modal-dialog modal-full-screen">
+               <div class="modal-content">
+                       <div id="modal-header" class="modal-header">
+                               <button id="modal-cloase" type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                                       &times;
+                               </button>
+                               <h4 id="modal-title" class="modal-title"></h4>
+                       </div>
+                       <div id="modal-body" class="modal-body">
+                               <!-- /# content goes here -->
+                       </div>
+               </div>
+       </div>
+</div>
+
+<!-- Dummy div to append other div's when needed (e.g. used for js function editpost() -->
+<div id="cache-container"></div>
+
+</footer>
+<?php } ?> <!-- End of condition if $minal else the rest -->
+</body>
diff --git a/view/theme/frio/php/modes/default.php b/view/theme/frio/php/modes/default.php
deleted file mode 100644 (file)
index 6f9c1a4..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * @file view/theme/frio/php/modes/default.php
- * @brief The default site template
- */
-?>
-
-<!DOCTYPE html >
-
-<?php 
-       require_once('view/theme/frio/php/frio_boot.php');
-
-//     $minimal = is_modal();
-
-?>
-
-<html>
-<head>
-       <title><?php if(x($page,'title')) echo $page['title'] ?></title>
-       <meta request="<?php echo $_REQUEST['pagename'] ?> ">
-       <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
-       <script>var frio="<?php echo "view/theme/frio"; ?>";</script>
-       <?php $baseurl = $a->get_baseurl(); ?>
-       <?php $frio = "view/theme/frio"; ?>
-       <?php 
-               // Because we use minimal for modals the header and the included js stuff should be only loaded
-               // if the page is an standard page (so we don't have it twice for modals)
-               // 
-               /// @todo Think about to move js stuff in the footer
-               if(!$minimal) {
-                       if(x($page,'htmlhead')) echo $page['htmlhead'];
-               }
-       ?>
-       
-
-</head>
-<?php
-if(($_SERVER['REQUEST_URI'] != "/register") && ($_SERVER['REQUEST_URI'] != "/lostpass") && ($_SERVER['REQUEST_URI'] != "/login"))
-{
-       echo"<body id=\"top\">";
-}
-else
-{
-       echo"<body id=\"top\">";
-}
-?>
-<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
-<?php
-       if(x($page,'nav') && (!$minimal)){
-       echo    str_replace("~config.sitename~",get_config('config','sitename'),
-                       str_replace("~system.banner~",get_config('system','banner'),
-                       $page['nav']
-       ));};
-
-       // special minimal style for modal dialogs
-       if($minimal) {
-?>
-               <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>
-                       <div id="page-footer"></div>
-               </section>
-<?php  }
-       // the style for all other pages
-       else {
-?>     <main>
-               <div class="container">
-                       <div class="row">
-<?php
-                               if(($_REQUEST['pagename'] != "register") && ($_REQUEST['pagename'] != "lostpass") && ($_REQUEST['pagename'] != "login") && ($_SERVER['REQUEST_URI'] != "/"))
-                               {
-                                       echo"
-                                       <aside class=\"col-lg-3 col-md-3 offcanvas-sm offcanvas-xs\">
-                                               "; if(x($page,'aside')) echo $page['aside']; echo"
-                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
-                                       </aside>
-
-                                       <!-- The following paragraph can maybe deleted because we don't need it anymore -->
-                                       <div id=\"NavAside\" class=\"navmenu navmenu-default navmenu-fixed-left offcanvas hidden-lg hidden-md\">
-                                               <div class=\"nav-container\">
-                                                       <div class=\"list-group\">
-                                                               "; if(x($page,'aside')) echo $page['aside']; echo"
-                                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
-                                                       </div>
-                                               </div>
-                                       </div><!--/.sidebar-offcanvas-->
-
-                                       <div class=\"col-lg-7 col-md-7 col-sm-12 col-xs-12\" id=\"content\">
-                                               <section class=\"sectiontop "; echo $a->argv[0]; echo "-content-wrapper\">";
-                                                               if(x($page,'content')) echo $page['content']; echo"
-                                                               <div id=\"pause\"></div> <!-- The pause/resume Ajax indicator -->
-                                               </section>
-                                       </div>
-                                               ";
-                               }
-                               else
-                               {
-                                       echo"
-                                       <div class=\"col-lg-12 col-md-12 col-sm-12 col-xs-12\" id=\"content\" style=\"margin-top:50px;\" >
-                                               "; if(x($page,'content')) echo $page['content']; echo"
-                                       </div>
-                                       ";
-                               }
-?>
-               
-                       </div><!--row-->
-               </div><!-- container -->
-
-               <div id="back-to-top" title="back to top">&#8679;</div>
-       </main>
-
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-<!-- Modal  -->
-<div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="plan-info" aria-hidden="true">
-       <div class="modal-dialog modal-full-screen">
-               <div class="modal-content">
-                       <div id="modal-header" class="modal-header">
-                               <button id="modal-cloase" type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                                       &times;
-                               </button>
-                               <h4 id="modal-title" class="modal-title"></h4>
-                       </div>
-                       <div id="modal-body" class="modal-body">
-                               <!-- /# content goes here -->
-                       </div>
-               </div>
-       </div>
-</div>
-
-<!-- Dummy div to append other div's when needed (e.g. used for js function editpost() -->
-<div id="cache-container"></div>
-
-</footer>
-<?php } ?> <!-- End of condition if $minal else the rest -->
-</body>
diff --git a/view/theme/frio/php/modes/none.php b/view/theme/frio/php/modes/none.php
deleted file mode 100644 (file)
index 5b96e28..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php\r
-/**\r
- * @file view/theme/frio/php/modes/none.php\r
- * @brief The site template for pure content (e.g. (modals)\r
- * \r
- * This themplate is used e.g for bs modals. So outputs\r
- * only the pure content\r
- */\r
-\r
-if(x($page,'content')) echo $page['content'];\r
-\r
diff --git a/view/theme/frio/php/modes/standard.php b/view/theme/frio/php/modes/standard.php
deleted file mode 100644 (file)
index 93007bc..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * @file view/theme/frio/php/modes/default.php
- * @brief The default site template
- */
-?>
-
-<!DOCTYPE html >
-
-<html>
-<head>
-       <title><?php if(x($page,'title')) echo $page['title'] ?></title>
-       <meta name="viewport" content="initial-scale=1.0">
-       <meta request="<?php echo $_REQUEST['pagename'] ?> ">
-       <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
-       <script>var frio="<?php echo "view/theme/frio"; ?>";</script>
-       <?php $baseurl = $a->get_baseurl(); ?>
-       <?php $frio = "view/theme/frio"; ?>
-       <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-       
-
-</head>
-<body id=\"top\">";
-<?php if($_SERVER['REQUEST_URI'] == "/"){header('Location: /login');} ?>
-<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
-<?php
-       if(x($page,'nav')) {
-       echo    str_replace("~config.sitename~",get_config('config','sitename'),
-                       str_replace("~system.banner~",get_config('system','banner'),
-                       $page['nav']
-       ));};
-?>
-       <main>
-
-               <div class="container">
-                       <div class="row">
-<?php
-                                       echo"
-                                       <aside class=\"col-lg-3 col-md-3 hidden-sm hidden-xs\">
-                                               "; if(x($page,'aside')) echo $page['aside']; echo"
-                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
-                                               "; include('includes/photo_side.php'); echo"
-                                       </aside>
-
-                                       <div id=\"NavAside\" class=\"navmenu navmenu-default navmenu-fixed-left offcanvas hidden-lg hidden-md\">
-                                               <div class=\"nav-container\">
-                                                       <div class=\"list-group\">
-                                                               "; if(x($page,'aside')) echo $page['aside']; echo"
-                                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
-                                                               "; include('includes/photo_side.php'); echo"
-                                                       </div>
-                                               </div>
-                                       </div><!--/.sidebar-offcanvas-->
-
-                                       <div class=\"col-lg-8 col-md-8 col-sm-12 col-xs-12\" id=\"content\">
-                                               <section class=\"sectiontop\">
-                                                               <div class=\"panel "; echo $a->argv[0]; echo "-content-wrapper\">
-                                                                       <div class=\"panel-body\">";
-                                                                               if(x($page,'content')) echo $page['content']; echo"
-                                                                               <div id=\"pause\"></div> <!-- The pause/resume Ajax indicator -->
-                                                                       </div>
-                                                               </div>
-                                               </section>
-                                       </div>
-                                               ";
-?>
-               
-                       </div><!--row-->
-               </div><!-- container -->
-
-               <div id="back-to-top" title="back to top">&#8679;</div>
-       </main>
-
-<footer>
-<span id="notifsound"></span>
-<script>
-       $("#menu-toggle").click(function(e) {
-               e.preventDefault();
-               $("#wrapper").toggleClass("toggled");
-       });
-</script>
-<script type="text/javascript">
-       $.fn.enterKey = function (fnc, mod) {
-               return this.each(function () {
-                       $(this).keypress(function (ev) {
-                               var keycode = (ev.keyCode ? ev.keyCode : ev.which);
-                               if ((keycode == '13' || keycode == '10') && (!mod || ev[mod + 'Key'])) {
-                                       fnc.call(this, ev);
-                               }
-                       })
-               })
-       }
-       
-       $('textarea').enterKey(function() {$(this).closest('form').submit(); }, 'ctrl')
-       $('input').enterKey(function() {$(this).closest('form').submit(); }, 'ctrl')
-</script>
-
-<script>
-var pagetitle = null;
-$("nav").bind('nav-update', function(e,data)
-{
-       if (pagetitle==null) pagetitle = document.title;
-       var count = $(data).find('notif').attr('count');
-       if (count>0)
-       {
-               document.title = "("+count+") "+pagetitle;
-               /* document.getElementById('notifsound').innerHTML='<object type="audio/mpeg" width="0" height="0" data="<?=$frio?>/audios/901.mp3"><param name="notif" value="<?=$frio?>/audios/901.mp3" /><param name="autostart" value="true" /><param name="loop" value="false" /></object>'; */
-       }
-       else
-       {
-               document.title = pagetitle;
-       }
-});
-</script>
-<script src="<?=$frio?>/js/theme.js"></script>
-<script src="<?=$frio?>/js/acl.js"></script>
-<script src="<?=$frio?>/frameworks/bootstrap/js/bootstrap.min.js"></script>
-<script src="<?=$frio?>/frameworks/jasny/js/jasny-bootstrap.min.js"></script>
-<script src="<?=$frio?>/frameworks/bootstrap-select/js/bootstrap-select.min.js"></script>
-<script src="<?=$frio?>/frameworks/ekko-lightbox/ekko-lightbox.min.js"></script>
-<script src="<?=$frio?>/frameworks/justifiedGallery/jquery.justifiedGallery.min.js"></script>
-
-<!-- Modal  -->
-<div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="plan-info" aria-hidden="true">
-       <div class="modal-dialog modal-full-screen">
-               <div class="modal-content">
-                       <div id="modal-header" class="modal-header">
-                               <button id="modal-cloase" type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                                       &times;
-                               </button>
-                               <h4 id="modal-title" class="modal-title"></h4>
-                       </div>
-                       <div id="modal-body" class="modal-body">
-                               <!-- /# content goes here -->
-                       </div>
-               </div>
-       </div>
-</div>
-
-
-</footer>
-</body>
diff --git a/view/theme/frio/php/standard.php b/view/theme/frio/php/standard.php
new file mode 100644 (file)
index 0000000..93007bc
--- /dev/null
@@ -0,0 +1,142 @@
+<?php
+/**
+ * @file view/theme/frio/php/modes/default.php
+ * @brief The default site template
+ */
+?>
+
+<!DOCTYPE html >
+
+<html>
+<head>
+       <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+       <meta name="viewport" content="initial-scale=1.0">
+       <meta request="<?php echo $_REQUEST['pagename'] ?> ">
+       <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+       <script>var frio="<?php echo "view/theme/frio"; ?>";</script>
+       <?php $baseurl = $a->get_baseurl(); ?>
+       <?php $frio = "view/theme/frio"; ?>
+       <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
+       
+
+</head>
+<body id=\"top\">";
+<?php if($_SERVER['REQUEST_URI'] == "/"){header('Location: /login');} ?>
+<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
+<?php
+       if(x($page,'nav')) {
+       echo    str_replace("~config.sitename~",get_config('config','sitename'),
+                       str_replace("~system.banner~",get_config('system','banner'),
+                       $page['nav']
+       ));};
+?>
+       <main>
+
+               <div class="container">
+                       <div class="row">
+<?php
+                                       echo"
+                                       <aside class=\"col-lg-3 col-md-3 hidden-sm hidden-xs\">
+                                               "; if(x($page,'aside')) echo $page['aside']; echo"
+                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
+                                               "; include('includes/photo_side.php'); echo"
+                                       </aside>
+
+                                       <div id=\"NavAside\" class=\"navmenu navmenu-default navmenu-fixed-left offcanvas hidden-lg hidden-md\">
+                                               <div class=\"nav-container\">
+                                                       <div class=\"list-group\">
+                                                               "; if(x($page,'aside')) echo $page['aside']; echo"
+                                                               "; if(x($page,'right_aside')) echo $page['right_aside']; echo"
+                                                               "; include('includes/photo_side.php'); echo"
+                                                       </div>
+                                               </div>
+                                       </div><!--/.sidebar-offcanvas-->
+
+                                       <div class=\"col-lg-8 col-md-8 col-sm-12 col-xs-12\" id=\"content\">
+                                               <section class=\"sectiontop\">
+                                                               <div class=\"panel "; echo $a->argv[0]; echo "-content-wrapper\">
+                                                                       <div class=\"panel-body\">";
+                                                                               if(x($page,'content')) echo $page['content']; echo"
+                                                                               <div id=\"pause\"></div> <!-- The pause/resume Ajax indicator -->
+                                                                       </div>
+                                                               </div>
+                                               </section>
+                                       </div>
+                                               ";
+?>
+               
+                       </div><!--row-->
+               </div><!-- container -->
+
+               <div id="back-to-top" title="back to top">&#8679;</div>
+       </main>
+
+<footer>
+<span id="notifsound"></span>
+<script>
+       $("#menu-toggle").click(function(e) {
+               e.preventDefault();
+               $("#wrapper").toggleClass("toggled");
+       });
+</script>
+<script type="text/javascript">
+       $.fn.enterKey = function (fnc, mod) {
+               return this.each(function () {
+                       $(this).keypress(function (ev) {
+                               var keycode = (ev.keyCode ? ev.keyCode : ev.which);
+                               if ((keycode == '13' || keycode == '10') && (!mod || ev[mod + 'Key'])) {
+                                       fnc.call(this, ev);
+                               }
+                       })
+               })
+       }
+       
+       $('textarea').enterKey(function() {$(this).closest('form').submit(); }, 'ctrl')
+       $('input').enterKey(function() {$(this).closest('form').submit(); }, 'ctrl')
+</script>
+
+<script>
+var pagetitle = null;
+$("nav").bind('nav-update', function(e,data)
+{
+       if (pagetitle==null) pagetitle = document.title;
+       var count = $(data).find('notif').attr('count');
+       if (count>0)
+       {
+               document.title = "("+count+") "+pagetitle;
+               /* document.getElementById('notifsound').innerHTML='<object type="audio/mpeg" width="0" height="0" data="<?=$frio?>/audios/901.mp3"><param name="notif" value="<?=$frio?>/audios/901.mp3" /><param name="autostart" value="true" /><param name="loop" value="false" /></object>'; */
+       }
+       else
+       {
+               document.title = pagetitle;
+       }
+});
+</script>
+<script src="<?=$frio?>/js/theme.js"></script>
+<script src="<?=$frio?>/js/acl.js"></script>
+<script src="<?=$frio?>/frameworks/bootstrap/js/bootstrap.min.js"></script>
+<script src="<?=$frio?>/frameworks/jasny/js/jasny-bootstrap.min.js"></script>
+<script src="<?=$frio?>/frameworks/bootstrap-select/js/bootstrap-select.min.js"></script>
+<script src="<?=$frio?>/frameworks/ekko-lightbox/ekko-lightbox.min.js"></script>
+<script src="<?=$frio?>/frameworks/justifiedGallery/jquery.justifiedGallery.min.js"></script>
+
+<!-- Modal  -->
+<div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="plan-info" aria-hidden="true">
+       <div class="modal-dialog modal-full-screen">
+               <div class="modal-content">
+                       <div id="modal-header" class="modal-header">
+                               <button id="modal-cloase" type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                                       &times;
+                               </button>
+                               <h4 id="modal-title" class="modal-title"></h4>
+                       </div>
+                       <div id="modal-body" class="modal-body">
+                               <!-- /# content goes here -->
+                       </div>
+               </div>
+       </div>
+</div>
+
+
+</footer>
+</body>
diff --git a/view/theme/frost-mobile/default.php b/view/theme/frost-mobile/default.php
deleted file mode 100644 (file)
index 332291c..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html >\r
-<html lang="<?php echo $lang; ?>">\r
-<head>\r
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>\r
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
-</head>\r
-<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>\r
-       <?php if(x($page,'nav')) echo $page['nav']; ?>\r
-\r
-       <?php if( $a->module === 'home' ) { ?>\r
-       <center>\r
-       <div class="login-button">\r
-       <a href="login" class="login-button-link"><img class="login-button-image" src="images/friendica-1600.png" title="Click to log in"></a>\r
-       </div>\r
-       </center>\r
-\r
-       <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {\r
-       ?>\r
-       <div class='section-wrapper'>\r
-       <section><?php if(x($page,'content')) echo $page['content']; ?>\r
-       </section>\r
-       </div>\r
-       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
-\r
-       <?php } else { ?>\r
-       <div class='main-container'>\r
-<!--           <div class='main-content-container'>-->\r
-               <div class='section-wrapper'>\r
-               <?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>\r
-               <section>\r
-                       <?php if(x($page,'content')) echo $page['content']; ?>\r
-                       <div id="pause"></div> <!-- The pause/resume Ajax indicator -->\r
-                       <div id="page-footer"></div>\r
-               </section>\r
-               </div>\r
-               <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>\r
-               <?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>\r
-               <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
-<!--           </div>-->\r
-       </div>\r
-       <?php } ?>\r
-       <?php if(x($page,'end')) echo $page['end']; ?>\r
-</body>\r
-</html>\r
diff --git a/view/theme/frost-mobile/php/default.php b/view/theme/frost-mobile/php/default.php
new file mode 100644 (file)
index 0000000..332291c
--- /dev/null
@@ -0,0 +1,45 @@
+<!DOCTYPE html >\r
+<html lang="<?php echo $lang; ?>">\r
+<head>\r
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>\r
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
+</head>\r
+<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>\r
+       <?php if(x($page,'nav')) echo $page['nav']; ?>\r
+\r
+       <?php if( $a->module === 'home' ) { ?>\r
+       <center>\r
+       <div class="login-button">\r
+       <a href="login" class="login-button-link"><img class="login-button-image" src="images/friendica-1600.png" title="Click to log in"></a>\r
+       </div>\r
+       </center>\r
+\r
+       <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {\r
+       ?>\r
+       <div class='section-wrapper'>\r
+       <section><?php if(x($page,'content')) echo $page['content']; ?>\r
+       </section>\r
+       </div>\r
+       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
+\r
+       <?php } else { ?>\r
+       <div class='main-container'>\r
+<!--           <div class='main-content-container'>-->\r
+               <div class='section-wrapper'>\r
+               <?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>\r
+               <section>\r
+                       <?php if(x($page,'content')) echo $page['content']; ?>\r
+                       <div id="pause"></div> <!-- The pause/resume Ajax indicator -->\r
+                       <div id="page-footer"></div>\r
+               </section>\r
+               </div>\r
+               <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>\r
+               <?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>\r
+               <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
+<!--           </div>-->\r
+       </div>\r
+       <?php } ?>\r
+       <?php if(x($page,'end')) echo $page['end']; ?>\r
+</body>\r
+</html>\r
diff --git a/view/theme/frost/default.php b/view/theme/frost/default.php
deleted file mode 100644 (file)
index c67bdcf..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html >\r
-<html lang="<?php echo $lang; ?>">\r
-<head>\r
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>\r
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
-</head>\r
-<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>\r
-       <?php if(x($page,'nav')) echo $page['nav']; ?>\r
-\r
-       <?php if( $a->module === 'home' ) { ?>\r
-       <center>\r
-       <div class="login-button">\r
-       <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendica-1600.png" title="Click to log in"></a>\r
-       </div>\r
-       </center>\r
-\r
-       <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {\r
-       ?>\r
-       <div class='section-wrapper'>\r
-       <section><?php if(x($page,'content')) echo $page['content']; ?>\r
-       </section>\r
-       </div>\r
-       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
-\r
-       <?php } else { ?>\r
-       <div class='main-container'>\r
-               <!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->\r
-               <div class='main-content-container'>\r
-               <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>\r
-               <section>\r
-                       <?php if(x($page,'content')) echo $page['content']; ?>\r
-                       <div id="pause"></div> <!-- The pause/resume Ajax indicator -->\r
-                       <div id="page-footer"></div>\r
-               </section>\r
-               <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>\r
-               <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
-               </div>\r
-       </div>\r
-       <?php } ?>\r
-       <?php if(x($page,'end')) echo $page['end']; ?>\r
-</body>\r
-</html>\r
diff --git a/view/theme/frost/php/default.php b/view/theme/frost/php/default.php
new file mode 100644 (file)
index 0000000..c67bdcf
--- /dev/null
@@ -0,0 +1,43 @@
+<!DOCTYPE html >\r
+<html lang="<?php echo $lang; ?>">\r
+<head>\r
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>\r
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
+</head>\r
+<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>\r
+       <?php if(x($page,'nav')) echo $page['nav']; ?>\r
+\r
+       <?php if( $a->module === 'home' ) { ?>\r
+       <center>\r
+       <div class="login-button">\r
+       <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendica-1600.png" title="Click to log in"></a>\r
+       </div>\r
+       </center>\r
+\r
+       <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {\r
+       ?>\r
+       <div class='section-wrapper'>\r
+       <section><?php if(x($page,'content')) echo $page['content']; ?>\r
+       </section>\r
+       </div>\r
+       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
+\r
+       <?php } else { ?>\r
+       <div class='main-container'>\r
+               <!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->\r
+               <div class='main-content-container'>\r
+               <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>\r
+               <section>\r
+                       <?php if(x($page,'content')) echo $page['content']; ?>\r
+                       <div id="pause"></div> <!-- The pause/resume Ajax indicator -->\r
+                       <div id="page-footer"></div>\r
+               </section>\r
+               <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>\r
+               <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
+               </div>\r
+       </div>\r
+       <?php } ?>\r
+       <?php if(x($page,'end')) echo $page['end']; ?>\r
+</body>\r
+</html>\r
diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php
deleted file mode 100644 (file)
index 405e1ca..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html >
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
-  <script type="text/javascript">
-       function ScrollToBottom(){
-       window.scrollTo(0,document.body.scrollHeight);
-       }
-  </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="pause"></div> <!-- The pause/resume Ajax indicator -->
-               <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>
-
-       <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>
diff --git a/view/theme/smoothly/php/default.php b/view/theme/smoothly/php/default.php
new file mode 100644 (file)
index 0000000..405e1ca
--- /dev/null
@@ -0,0 +1,45 @@
+<!DOCTYPE html >
+<html>
+<head>
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <script type="text/javascript">
+       function ScrollToBottom(){
+       window.scrollTo(0,document.body.scrollHeight);
+       }
+  </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="pause"></div> <!-- The pause/resume Ajax indicator -->
+               <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>
+
+       <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>