Changeset 81454 in spip-zone


Ignore:
Timestamp:
Mar 18, 2014, 4:46:25 PM (5 years ago)
Author:
kent1@…
Message:

Réorganisation des tests dans options pour passer ce qui ne nécessite pas d'inclusions

Ajout de jQuery pour le formulaire de recherche

Version 0.3.1

Location:
_plugins_/intranet/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • _plugins_/intranet/trunk/inclure/intranet.html

    r73114 r81454  
    66<meta name="robots" content="none" />
    77<meta name="generator" content="SPIP[ (#SPIP_VERSION)]" />
    8 <link rel="stylesheet" href="[(#VAL{reset.css}|find_in_theme|direction_css)]" type="text/css" />
    9 <link rel="stylesheet" href="[(#VAL{clear.css}|find_in_theme|direction_css)]" type="text/css" />
    10 <link rel="stylesheet" href="[(#VAL{minipres.css}|find_in_theme|direction_css)]" type="text/css" />
     8
     9[<script src="(#CHEMIN{javascript/jquery.js})" type="text/javascript"></script>]
     10[<link rel="stylesheet" href="(#VAL{reset.css}|find_in_theme|direction_css)" type="text/css" />]
     11[<link rel="stylesheet" href="(#VAL{clear.css}|find_in_theme|direction_css)" type="text/css" />]
     12[<link rel="stylesheet" href="(#VAL{minipres.css}|find_in_theme|direction_css)" type="text/css" />]
    1113
    1214</head>
  • _plugins_/intranet/trunk/intranet_options.php

    r74613 r81454  
    3131        if (
    3232                !test_espace_prive()
     33                AND strpos($flux['args']['fond'],'/')===false
     34                AND !in_array(substr($flux['args']['fond'],-3),array('.js','.css'))
    3335                AND include_spip('inc/autoriser')
     36                AND !autoriser('intranet')
    3437                AND include_spip('inc/config')
    35                 AND strpos($flux['args']['fond'],'/')===false
    36                 AND !autoriser('intranet')
    3738                AND ($pages_ok = array_filter(pipeline('intranet_pages_ok',array_merge(array('robots.txt','spip_pass','favicon.ico','informer_auteur'),explode(',',lire_config('intranet/pages_intranet',' '))))))
    3839                AND !in_array($flux['args']['fond'],$pages_ok)
    39                 AND !in_array($flux['args']['contexte'][_SPIP_PAGE],$pages_ok)
    40                 AND !in_array(substr($flux['args']['fond'],-3),array('.js','.css'))){
     40                AND !in_array($flux['args']['contexte'][_SPIP_PAGE],$pages_ok)){
    4141                        $fond = trouver_fond('inclure/intranet','',true);
    4242                        $flux['data'] = $fond['fond'];
  • _plugins_/intranet/trunk/paquet.xml

    r74613 r81454  
    22        prefix="intranet"
    33        categorie="maintenance"
    4         version="0.3.0"
     4        version="0.3.1"
    55        etat="stable"
    66        compatibilite="[3.0.0;3.0.*]"
     
    1212
    1313        <auteur mail="kent1@arscenic.info" lien="http://www.kent1.info">kent1</auteur>
    14         <copyright>2013</copyright>
     14        <copyright>2013-2014</copyright>
    1515
    1616        <licence lien="http://www.gnu.org/licenses/gpl-3.0.html">GPL 3</licence>
  • _plugins_/intranet/trunk/spip_pass.html

    r72683 r81454  
    1010<meta name="robots" content="none" />
    1111<meta name="viewport" content="width=device-width" />
    12 <link rel="stylesheet" href="[(#VAL{reset.css}|find_in_theme|direction_css)]" type="text/css" />
    13 <link rel="stylesheet" href="[(#VAL{clear.css}|find_in_theme|direction_css)]" type="text/css" />
    14 <link rel="stylesheet" href="[(#VAL{minipres.css}|find_in_theme|direction_css)]" type="text/css" />
     12[<script src="(#CHEMIN{javascript/jquery.js})" type="text/javascript"></script>]
     13[<link rel="stylesheet" href="(#VAL{reset.css}|find_in_theme|direction_css)" type="text/css" />]
     14[<link rel="stylesheet" href="(#VAL{clear.css}|find_in_theme|direction_css)" type="text/css" />]
     15[<link rel="stylesheet" href="(#VAL{minipres.css}|find_in_theme|direction_css)" type="text/css" />]
    1516<meta name="generator" content="SPIP[ (#SPIP_VERSION)]" />
    1617</head>
Note: See TracChangeset for help on using the changeset viewer.