Browse Source

add possibility to load custom page templates + none.php pagetemplate is part of core now

tags/3.5
rabuzarus 4 years ago
parent
commit
15471f3835
15 changed files with 52 additions and 48 deletions
  1. +2
    -2
      include/acl_selectors.php
  2. +38
    -0
      include/plugin.php
  3. +11
    -13
      index.php
  4. +1
    -1
      js/autocomplete.js
  5. +0
    -0
      view/php/default.php
  6. +0
    -0
      view/php/minimal.php
  7. +0
    -0
      view/php/none.php
  8. +0
    -0
      view/theme/decaf-mobile/php/default.php
  9. +0
    -0
      view/theme/dispy/php/default.php
  10. +0
    -32
      view/theme/frio/default.php
  11. +0
    -0
      view/theme/frio/php/default.php
  12. +0
    -0
      view/theme/frio/php/standard.php
  13. +0
    -0
      view/theme/frost-mobile/php/default.php
  14. +0
    -0
      view/theme/frost/php/default.php
  15. +0
    -0
      view/theme/smoothly/php/default.php

+ 2
- 2
include/acl_selectors.php View 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)


+ 38
- 0
include/plugin.php View 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 '';
}

+ 11
- 13
index.php View File

@@ -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;

+ 1
- 1
js/autocomplete.js View 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({


view/default.php → view/php/default.php View File


view/minimal.php → view/php/minimal.php View File


view/theme/frio/php/modes/none.php → view/php/none.php View File


view/theme/decaf-mobile/default.php → view/theme/decaf-mobile/php/default.php View File


view/theme/dispy/default.php → view/theme/dispy/php/default.php View File


+ 0
- 32
view/theme/frio/default.php View File

@@ -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";
}


view/theme/frio/php/modes/default.php → view/theme/frio/php/default.php View File


view/theme/frio/php/modes/standard.php → view/theme/frio/php/standard.php View File


view/theme/frost-mobile/default.php → view/theme/frost-mobile/php/default.php View File


view/theme/frost/default.php → view/theme/frost/php/default.php View File


view/theme/smoothly/default.php → view/theme/smoothly/php/default.php View File


Loading…
Cancel
Save