Changeset 9660


Ignore:
Timestamp:
Mar 14, 2011, 12:18:18 PM (10 years ago)
Author:
patdenice
Message:

2.2 compatible

Location:
extensions/AdditionalPages/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • extensions/AdditionalPages/trunk/additional_page.php

    r9659 r9660  
    4949if (is_numeric($identifier) and !empty($row['permalink']) and !$page['ap_homepage'])
    5050{
    51   redirect(make_index_url().'/page/' . $row['permalink']);
     51  redirect(make_index_url(array('section'=>'page')).'/'.$row['permalink']);
    5252}
    5353
  • extensions/AdditionalPages/trunk/admin/add_page.inc.php

    r9546 r9660  
    119119    if (isset($_GET['redirect']))
    120120    {
    121       redirect(make_index_url() . '/page/' . $edited_page['id']);
     121      redirect(make_index_url(array('section'=>'page')).'/'.$edited_page['id']);
    122122    }
    123123    redirect($my_base_url.'&page_saved=');
  • extensions/AdditionalPages/trunk/admin/manage.inc.php

    r9350 r9660  
    2727    pwg_query($query);
    2828  }
     29  array_push($page['infos'], l10n('ap_conf_saved'));
    2930}
    3031
     
    4445while ($row = pwg_db_fetch_assoc($result))
    4546{
    46   $row['U_PAGE'] = make_index_url().'/page/'.(isset($row['permalink']) ? $row['permalink'] : $row['id']);
     47  $row['U_PAGE'] = make_index_url(array('section'=>'page')).'/'.(isset($row['permalink']) ? $row['permalink'] : $row['id']);
    4748  $row['U_EDIT'] = PHPWG_ROOT_PATH.'admin.php?page=plugin&section='.AP_DIR.'%2Fadmin%2Fadmin.php&tab=edit_page&edit='.$row['id'];
    4849  $row['U_DELETE'] = PHPWG_ROOT_PATH.'admin.php?page=plugin&section='.AP_DIR.'%2Fadmin%2Fadmin.php&tab=edit_page&edit='.$row['id'].'&delete=';
  • extensions/AdditionalPages/trunk/admin/template/add_page.tpl

    r9350 r9660  
    1 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    2 {html_head}{literal}
    3 <script type="text/javascript">
     1{footer_script require='jquery'}{literal}
    42jQuery().ready( function () {
    53  jQuery('#title').focusout(function () {
     
    1210});
    1311var auto_permalink = true;
    14 </script>
     12{/literal}{/footer_script}
     13{html_head}{literal}
    1514<style type="text/css">
    1615#mainConf { margin:0; }
  • extensions/AdditionalPages/trunk/admin/template/config.tpl

    r9350 r9660  
    1 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    2 {html_head}
    3 <script type="text/javascript">
    4 jQuery().ready( function () {ldelim}
    5   jQuery("#show_menu").click( function() {ldelim}
    6     if (this.checked) {ldelim}
     1{footer_script}{literal}
     2jQuery().ready( function () {
     3  jQuery("#show_menu").click( function() {
     4    if (this.checked) {
    75      jQuery('#menu_name').show();
    86    }
    9     else {ldelim}
     7    else {
    108      jQuery('#menu_name').hide();
    119    }
    1210  });
    13   jQuery('select[name="lang_desc_select"]').change(function () {ldelim}
     11  jQuery('select[name="lang_desc_select"]').change(function () {
    1412    jQuery('[id^="menu_lang"]').hide();
    1513    jQuery("#menu_lang_"+this.options[this.selectedIndex].value).show();
    1614  });
    17   jQuery('[id^="menu_lang_"]').keyup(function () {ldelim}
     15  jQuery('[id^="menu_lang_"]').keyup(function () {
    1816    arr = jQuery(this).attr("id").split("menu_lang_");
    1917    id = arr[1];
     
    2523  });
    2624});
    27 </script>
    28 {/html_head}
     25{/literal}{/footer_script}
    2926
    3027<div class="titrePage">
  • extensions/AdditionalPages/trunk/admin/template/manage.tpl

    r9313 r9660  
    1 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    2 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js" }
    3 {known_script id="jquery.ui.sortable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.sortable.packed.js" }
    4 
    5 {html_head}
    6 <script type="text/javascript">
    7   jQuery().ready(function(){ldelim}
     1{footer_script require='jquery.ui.sortable'}{literal}
     2  jQuery().ready(function(){
    83    jQuery(".menuPos").hide();
    94    jQuery(".drag_button").show();
    105    jQuery(".menuLi").css("cursor","move");
    11     jQuery(".menuUl").sortable({ldelim}
     6    jQuery(".menuUl").sortable({
    127      axis: "y",
    138      opacity: 0.8
    149    });
    15     jQuery("input[name^='hide_']").click(function() {ldelim}
     10    jQuery("input[name^='hide_']").click(function() {
    1611      men = this.name.split('hide_');
    17       if (this.checked) {ldelim}
     12      if (this.checked) {
    1813        jQuery("#menu_"+men[1]).addClass('menuLi_hidden');
    19       } else {ldelim}
     14      } else {
    2015        jQuery("#menu_"+men[1]).removeClass('menuLi_hidden');
    2116      }
    2217    });
    23     jQuery("#menuOrdering").submit(function(){ldelim}
     18    jQuery("#menuOrdering").submit(function(){
    2419      ar = jQuery('.menuUl').sortable('toArray');
    25       for(i=0;i<ar.length;i++) {ldelim}
     20      for(i=0;i<ar.length;i++) {
    2621        men = ar[i].split('menu_');
    2722        document.getElementsByName('position[' + men[1] + ']')[0].value = i;
     
    2924    });
    3025  });
    31 </script>
    32 <style type="text/css">#menuOrdering a:hover {ldelim} border:none; }</style>
    33 {/html_head}
     26{/literal}{/footer_script}
     27{html_head}{literal}
     28<style type="text/css">#menuOrdering a:hover { border:none; }</style>
     29{/literal}{/html_head}
    3430
    3531<div class="titrePage">
  • extensions/AdditionalPages/trunk/main.inc.php

    r9659 r9660  
    5656
    5757  if ($tokens[0] == 'additional_page' and !empty($tokens[1]))
    58     redirect(make_index_url().'/page/'.$tokens[1]);
     58    redirect(make_index_url(array('section'=>'page')).'/'.$tokens[1]);
    5959}
    6060
     
    9999    while ($row = pwg_db_fetch_assoc($result))
    100100    {
    101       $url = make_index_url().'/page/'.(isset($row['permalink']) ? $row['permalink'] : $row['id']);
     101      $url = make_index_url(array('section'=>'page')).'/'.(isset($row['permalink']) ? $row['permalink'] : $row['id']);
    102102      array_push($data, array('URL' => $url, 'LABEL' => trigger_event('AP_render_title', $row['title'])));
    103103    }
Note: See TracChangeset for help on using the changeset viewer.