rename the page template modal.php to none.php because it can be used for more than...

diff --git a/default.php b/default.php
index 2251c44c70b6fb98316a670afee223259ff0f6c5..0faa7d97bb6e7867ec673195a62af807c612ee7a 100644 (file)
--- a/default.php
+++ b/default.php
@@ -16,14 +16,14 @@ require_once('view/theme/frio/php/frio_boot.php');
 $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"] = "modal"
-//if($page_type === "modal") {
-//     $_GET["mode"] = "modal";
+// 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"] == "modal"))) {
+if((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) {
 
-       require "view/theme/frio/php/modes/modal.php";
+       require "view/theme/frio/php/modes/none.php";
 } elseif($page_type === "standard_page") {
        require "view/theme/frio/php/modes/standard.php";
 } else {

diff --git a/js/filebrowser.js b/js/filebrowser.js
index 58d050a743a871dbf3c1cfefef5dfde7851a5fdd..0fe501d548906379693703ac1e47b286b5f41139 100644 (file)
--- a/js/filebrowser.js
+++ b/js/filebrowser.js
@@ -95,7 +95,7 @@ var FileBrowser = {
 \r
                $(".folders a, .path a").on("click", function(e){\r
                        e.preventDefault();\r
-                       var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=modal";\r
+                       var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";\r
 \r
                        // load new content to fbrowser window\r
                        $(".fbrowser").load(url,function(){\r
@@ -161,10 +161,10 @@ var FileBrowser = {
                                                        $('#profile-rotator').hide();\r
                                                        return;\r
                                                }\r
-//                                             location = baseurl + "/fbrowser/image/?mode=modal"+location['hash'];\r
+//                                             location = baseurl + "/fbrowser/image/?mode=none"+location['hash'];\r
 //                                             location.reload(true);\r
 \r
-                                               var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=modal"\r
+                                               var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"\r
                                                // load new content to fbrowser window\r
                                                $(".fbrowser").load(url,function(){\r
                                                        $(function() {FileBrowser.init(nickname, type, hash);});\r
@@ -186,10 +186,10 @@ var FileBrowser = {
                                                        $('#profile-rotator').hide();\r
                                                        return;\r
                                                }\r
-//                                             location = baseurl + "/fbrowser/file/?mode=modal"+location['hash'];\r
+//                                             location = baseurl + "/fbrowser/file/?mode=none"+location['hash'];\r
 //                                             location.reload(true);\r
 \r
-                                               var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=modal"\r
+                                               var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"\r
                                                // load new content to fbrowser window\r
                                                $(".fbrowser").load(url,function(){\r
                                                        $(function() {FileBrowser.init(nickname, type, hash);});\r

diff --git a/js/hovercard.js b/js/hovercard.js
index c40d6331ea86ea6dbb32d0ae41c05e5591b29e2d..93c87e7a887ec953c14710a262fe6d2b82c607b5 100644 (file)
--- a/js/hovercard.js
+++ b/js/hovercard.js
@@ -126,7 +126,7 @@ function removeAllhoverCards(event,priorTo) {
 // Ajax request to get json contact data
 function getContactData(purl, url, actionOnSuccess) {
        var postdata = {
-               mode            : 'modal',
+               mode            : 'none',
                profileurl      : purl,
                datatype        : 'json',
        };
@@ -224,7 +224,7 @@ function getHoverCardContent(purl, url, callback) {
 // Ajax request to get the raw template content
 function getHoverCardTemplate (url, callback) {
        var postdata = {
-               mode: 'modal',
+               mode: 'none',
                datatype: 'tpl'
        };
 

diff --git a/js/modal.js b/js/modal.js
index 8868e06407228cab6ecd4c25e67242b5a19e476e..354a5e11d9b5194111ade3d740e89939f97e0532 100644 (file)
--- a/js/modal.js
+++ b/js/modal.js
@@ -91,7 +91,7 @@ Dialog.show = function(url) {
 Dialog._get_url = function(type, name, id) {
        var hash = name;
        if (id !== undefined) hash = hash + "-" + id;
-       return "fbrowser/"+type+"/?mode=modal#"+hash;
+       return "fbrowser/"+type+"/?mode=none#"+hash;
 };
 
 // does load the filebrowser into the jot modal
@@ -119,7 +119,7 @@ Dialog._load = function(url) {
        var type = $("#fb-type").attr("value");
 
        // try to fetch the hash form the url
-       var match = url.match(/fbrowser\/[a-z]+\/\?mode=modal(.*)/);
+       var match = url.match(/fbrowser\/[a-z]+\/\?mode=none(.*)/);
        var hash = match[1];
 
        // initialize the filebrowser
@@ -157,7 +157,7 @@ function loadModalTitle() {
 function addToModal(url) {
        var char = qOrAmp(url);
 
-       var url = url + char + 'mode=modal';
+       var url = url + char + 'mode=none';
        var modal = $('#modal').modal();
 
        modal

diff --git a/php/frio_boot.php b/php/frio_boot.php
index 4067a9e5ebb86a86cda56f7e665f1451fc75a670..827874d7e1628ac60247ed14a3a30f8b122210c1 100644 (file)
--- a/php/frio_boot.php
+++ b/php/frio_boot.php
@@ -16,8 +16,8 @@
 function load_page(&$a) {
        if(isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) {
                require "view/theme/frio/minimal.php";
-       } elseif((isset($_GET["mode"]) AND ($_GET["mode"] == "modal"))) {
-               require "view/theme/frio/modal.php";
+       } elseif((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) {
+               require "view/theme/frio/none.php";
        } else {
                $template = 'view/theme/' . current_theme() . '/'
                        . ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';

diff --git a/php/modes/modal.php b/php/modes/modal.php
deleted file mode 100644 (file)
index 20291d4..0000000
--- a/php/modes/modal.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php\r
-/**\r
- * @file view/theme/frio/php/modes/modal.php\r
- * @brief The site template for Modals\r
- * \r
- * This themplate is used 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/php/modes/none.php b/php/modes/none.php
new file mode 100644 (file)
index 0000000..5b96e28
--- /dev/null
+++ b/php/modes/none.php
@@ -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/templates/nav.tpl b/templates/nav.tpl
index d6d5965e9c4955b2f87f48e6646fcf42cddba549..8eb13c1a42a2376aa117bf4c66e0d486c3a03a6a 100644 (file)
--- a/templates/nav.tpl
+++ b/templates/nav.tpl
@@ -242,7 +242,7 @@
                <div class="hidden-sm hidden-xs">
                        <ul class="nav navbar-nav navbar-right">
                                <li><a href="register" data-toggle="tooltip" title="{{$register.title}}"><i class="fa fa-street-view fa-fw"></i> {{$register.desc}}</a></li>
-                               <li><a href="login?mode=modal" data-toggle="tooltip" title="{{$login}}"><i class="fa fa-sign-in fa-fw"></i> {{$login}}</a></li>
+                               <li><a href="login?mode=none" data-toggle="tooltip" title="{{$login}}"><i class="fa fa-sign-in fa-fw"></i> {{$login}}</a></li>
                        </ul>
                </div>
        </div>

diff --git a/templates/wall_thread.tpl b/templates/wall_thread.tpl
index b327470c55a0b21f63cd0ff276453790e3183fa6..d41d61a16d07bdf43fd6beb3aa2bb233db24eb53 100644 (file)
--- a/templates/wall_thread.tpl
+++ b/templates/wall_thread.tpl
@@ -90,7 +90,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
                                        {{if $item.edpost}} {{* edit the posting *}}
                                        <li role="menuitem">
-                                               <a href="#" onclick="editpost('{{$item.edpost.0}}?mode=modal'); return false;" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
+                                               <a href="#" onclick="editpost('{{$item.edpost.0}}?mode=none'); return false;" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
                                        </li>
                                        {{/if}}