From 64a2f2022bf944a11a52a61b78ff5d42b1149164 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 15 May 2016 13:41:37 +0200 Subject: [PATCH] rename the page template modal.php to none.php because it can be used for more than modals --- default.php | 10 +++++----- js/filebrowser.js | 10 +++++----- js/hovercard.js | 4 ++-- js/modal.js | 6 +++--- php/frio_boot.php | 4 ++-- php/modes/modal.php | 11 ----------- php/modes/none.php | 11 +++++++++++ templates/nav.tpl | 2 +- templates/wall_thread.tpl | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 php/modes/modal.php create mode 100644 php/modes/none.php diff --git a/default.php b/default.php index 2251c44c70..0faa7d97bb 100644 --- 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 58d050a743..0fe501d548 100644 --- a/js/filebrowser.js +++ b/js/filebrowser.js @@ -95,7 +95,7 @@ var FileBrowser = { $(".folders a, .path a").on("click", function(e){ e.preventDefault(); - var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=modal"; + var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none"; // load new content to fbrowser window $(".fbrowser").load(url,function(){ @@ -161,10 +161,10 @@ var FileBrowser = { $('#profile-rotator').hide(); return; } -// location = baseurl + "/fbrowser/image/?mode=modal"+location['hash']; +// location = baseurl + "/fbrowser/image/?mode=none"+location['hash']; // location.reload(true); - var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=modal" + var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none" // load new content to fbrowser window $(".fbrowser").load(url,function(){ $(function() {FileBrowser.init(nickname, type, hash);}); @@ -186,10 +186,10 @@ var FileBrowser = { $('#profile-rotator').hide(); return; } -// location = baseurl + "/fbrowser/file/?mode=modal"+location['hash']; +// location = baseurl + "/fbrowser/file/?mode=none"+location['hash']; // location.reload(true); - var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=modal" + var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none" // load new content to fbrowser window $(".fbrowser").load(url,function(){ $(function() {FileBrowser.init(nickname, type, hash);}); diff --git a/js/hovercard.js b/js/hovercard.js index c40d6331ea..93c87e7a88 100644 --- 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 8868e06407..354a5e11d9 100644 --- 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 4067a9e5eb..827874d7e1 100644 --- 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 index 20291d4f0c..0000000000 --- a/php/modes/modal.php +++ /dev/null @@ -1,11 +0,0 @@ - diff --git a/templates/wall_thread.tpl b/templates/wall_thread.tpl index b327470c55..d41d61a16d 100644 --- 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 *}}
  • - {{$item.edpost.1}} + {{$item.edpost.1}}
    • {{/if}} -- 2.39.5