From: Jonny B. <jo...@ti...> - 2017-06-27 09:55:07
|
Done, and lightly tested locally - thanks Xavi, appreciated! :) jonny > On 27 Jun 2017, at 10:46, Jonny Bradley <jo...@ti...> wrote: > > > I would say yes, let's backport this - no point having an out of date faulty wizard ;) > > jb > > >> On 26 Jun 2017, at 22:59, Xavi via Tikiwiki-cvs <tik...@li...> wrote: >> >> Revision: 63086 >> http://sourceforge.net/p/tikiwiki/code/63086 >> Author: xavidp >> Date: 2017-06-26 21:59:00 +0000 (Mon, 26 Jun 2017) >> Log Message: >> ----------- >> [FIX]Typos, and Adding page exposing prefs about new and improved features in Tiki17 as well as iframe with doc page about Tiki17 also. To be backported to 17.x at some point (can this kind of fix - missing info - be backported just now before 17.0? - feel free anyone if so) >> >> Modified Paths: >> -------------- >> trunk/templates/wizard/upgrade_doc_page_iframe.tpl >> trunk/templates/wizard/upgrade_new_in_16.tpl >> trunk/tiki-wizard_admin.php >> >> Added Paths: >> ----------- >> trunk/lib/wizard/pages/upgrade_new_in_17.php >> trunk/templates/wizard/upgrade_new_in_17.tpl >> >> Copied: trunk/lib/wizard/pages/upgrade_new_in_17.php (from rev 63085, trunk/lib/wizard/pages/upgrade_new_in_16.php) >> =================================================================== >> --- trunk/lib/wizard/pages/upgrade_new_in_17.php (rev 0) >> +++ trunk/lib/wizard/pages/upgrade_new_in_17.php 2017-06-26 21:59:00 UTC (rev 63086) >> @@ -0,0 +1,57 @@ >> +<?php >> +// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project >> +// >> +// All Rights Reserved. See copyright.txt for details and a complete list of authors. >> +// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. >> +// $Id$ >> + >> +require_once('lib/wizard/wizard.php'); >> + >> +/** >> + * The Wizard's language handler >> + */ >> +class UpgradeWizardNewIn17 extends Wizard >> +{ >> + function pageTitle () >> + { >> + return tra('New in Tiki 17'); >> + } >> + >> + function isEditable () >> + { >> + return true; >> + } >> + >> + function onSetupPage ($homepageUrl) >> + { >> + global $prefs; >> + $smarty = TikiLib::lib('smarty'); >> + $addonprefs = TikiLib::lib('prefs')->getAddonPrefs(); >> + $smarty->assign('addonprefs', $addonprefs); >> + >> + // Run the parent first >> + parent::onSetupPage($homepageUrl); >> + >> + $showPage = true; >> + >> + // Show if any more specification is needed >> + >> + return $showPage; >> + } >> + >> + function getTemplate() >> + { >> + $wizardTemplate = 'wizard/upgrade_new_in_17.tpl'; >> + >> + return $wizardTemplate; >> + } >> + >> + function onContinue ($homepageUrl) >> + { >> + global $tikilib; >> + >> + // Run the parent first >> + parent::onContinue($homepageUrl); >> + >> + } >> +} >> >> Modified: trunk/templates/wizard/upgrade_doc_page_iframe.tpl >> =================================================================== >> --- trunk/templates/wizard/upgrade_doc_page_iframe.tpl 2017-06-26 14:19:46 UTC (rev 63085) >> +++ trunk/templates/wizard/upgrade_doc_page_iframe.tpl 2017-06-26 21:59:00 UTC (rev 63086) >> @@ -12,6 +12,16 @@ >> <div> >> <div class="simplebox"> >> <div class='titlebar'> >> + <b>doc.t.o/Tiki17</b>: {tr}To see it in full size out of this frame{/tr}, <a class="wiki external" target="_blank" href="https://doc.tiki.org/tiki-index_p.php?page=Tiki17" rel="external nofollow">{tr}click here{/tr}</a> >> + <img src="img/icons/external_link.gif" width="15" height="14" class="icon" /> >> + </div> >> + <p><iframe name="Documentation of Tiki 17" width="100%" height="300" align="middle" frameborder="1" marginheight="0" marginwidth="0" scrolling="auto" src="https://doc.tiki.org/tiki-index_p.php?page=Tiki17"></iframe></p> >> + </div> >> + <br/><br/> >> + </div> >> + <div> >> + <div class="simplebox"> >> + <div class='titlebar'> >> <b>doc.t.o/Tiki16</b>: {tr}To see it in full size out of this frame{/tr}, <a class="wiki external" target="_blank" href="https://doc.tiki.org/tiki-index_p.php?page=Tiki16" rel="external nofollow">{tr}click here{/tr}</a> >> <img src="img/icons/external_link.gif" width="15" height="14" class="icon" /> >> </div> >> >> Modified: trunk/templates/wizard/upgrade_new_in_16.tpl >> =================================================================== >> --- trunk/templates/wizard/upgrade_new_in_16.tpl 2017-06-26 14:19:46 UTC (rev 63085) >> +++ trunk/templates/wizard/upgrade_new_in_16.tpl 2017-06-26 21:59:00 UTC (rev 63086) >> @@ -6,7 +6,7 @@ >> <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> >> </span> >> {tr}Main new and improved features and settings in Tiki 16{/tr}. >> - <a href="http://doc.tiki.org/Tiki15" target="tikihelp" class="tikihelp" title="{tr}Tiki15:{/tr} >> + <a href="http://doc.tiki.org/Tiki16" target="tikihelp" class="tikihelp" title="{tr}Tiki16:{/tr} >> {tr}Tiki16 is a standard non-LTS version{/tr}. >> {tr}It will be supported until 17.1 is released{/tr}. >> {tr}New PHP minimum requirement for Tiki 16 is PHP 5.6{/tr}. >> >> Copied: trunk/templates/wizard/upgrade_new_in_17.tpl (from rev 63085, trunk/templates/wizard/upgrade_new_in_16.tpl) >> =================================================================== >> --- trunk/templates/wizard/upgrade_new_in_17.tpl (rev 0) >> +++ trunk/templates/wizard/upgrade_new_in_17.tpl 2017-06-26 21:59:00 UTC (rev 63086) >> @@ -0,0 +1,117 @@ >> +{* $Id$ *} >> + >> +<div class="media"> >> + <span class="pull-left fa-stack fa-lg margin-right-18em" alt="{tr}Upgrade Wizard{/tr}" title="Upgrade Wizard"> >> + <i class="fa fa-arrow-circle-up fa-stack-2x"></i> >> + <i class="fa fa-rotate-270 fa-magic fa-stack-2x margin-left-9em"></i> >> + </span> >> + {tr}Main new and improved features and settings in Tiki 17{/tr}. >> + <a href="http://doc.tiki.org/Tiki17" target="tikihelp" class="tikihelp" title="{tr}Tiki17:{/tr} >> + {tr}Tiki17 is a standard non-LTS version{/tr}. >> + {tr}It will be supported until 18.1 is released{/tr}. >> + {tr}Many libraries have been upgraded{/tr}. >> + <br/><br/> >> + {tr}Click to read more{/tr} >> + "> >> + {icon name="help" size=1} >> + </a> >> + <br/><br/><br/> >> + <div class="media-body"> >> + <fieldset> >> + <legend>{tr}H5P{/tr}</legend> >> + {preference name='h5p_enabled'} >> + <div class="adminoptionboxchild" id="h5p_enabled_childcontainer"> >> + {preference name='h5p_filegal_id'} >> + {preference name='h5p_whitelist'} >> + {preference name='h5p_dev_mode'} >> + {preference name='h5p_track_user'} >> + {preference name='h5p_save_content_state'} >> + <div class="adminoptionboxchild" id="h5p_save_content_state_childcontainer"> >> + {preference name='h5p_save_content_frequency'} >> + </div> >> + {preference name='h5p_export'} >> + </div> >> + </fieldset> >> + <fieldset class="table clearfix featurelist"> >> + <legend>{tr}New Wiki Plugins{/tr}</legend> >> + {preference name=wikiplugin_metatag} >> + {preference name=wikiplugin_pdf} >> + {preference name=wikiplugin_pdfpage} >> + {preference name=wikiplugin_pdfpagebreak} >> + {preference name=wikiplugin_shorten} >> + </fieldset> >> + <fieldset class="table clearfix featurelist"> >> + <legend>{tr}Improved Plugins{/tr}</legend> >> + {preference name=wikiplugin_html} >> + {preference name=wikiplugin_list} >> + {preference name=wikiplugin_listexecute} >> + </fieldset> >> + <fieldset class="table clearfix featurelist"> >> + <legend>{tr}HTTP Header Options{/tr}</legend> >> + {preference name=http_header_frame_options} >> + <div class="adminoptionboxchild" id="http_header_frame_options_childcontainer"> >> + {preference name=http_header_frame_options_value} >> + </div> >> + >> + {preference name=http_header_xss_protection} >> + <div class="adminoptionboxchild" id="http_header_xss_protection_childcontainer"> >> + {preference name=http_header_xss_protection_value} >> + </div> >> + >> + {preference name=http_header_content_type_options} >> + >> + {preference name=http_header_content_security_policy} >> + <div class="adminoptionboxchild" id="http_header_content_security_policy_childcontainer"> >> + {preference name=http_header_content_security_policy_value} >> + </div> >> + >> + {preference name=http_header_strict_transport_security} >> + <div class="adminoptionboxchild" id="http_header_strict_transport_security_childcontainer"> >> + {preference name=http_header_strict_transport_security_value} >> + </div> >> + >> + {preference name=http_header_public_key_pins} >> + <div class="adminoptionboxchild" id="http_header_public_key_pins_childcontainer"> >> + {preference name=http_header_public_key_pins_value} >> + </div> >> + >> + </fieldset> >> + <fieldset class="table clearfix featurelist"> >> + <legend>{tr}Intrusion Detection System (IDS) with Expose{/tr}</legend> >> + {preference name=ids_enabled} >> + <div class="adminoptionboxchild" id="ids_enabled_childcontainer"> >> + <div class="form-group adminoptionbox clearfix"> >> + <div class="col-sm-offset-4 col-sm-8"> >> + <a href="tiki-admin_ids.php">{tr}Admin IDS custom rules{/tr}</a> >> + </div> >> + </div> >> + {preference name=ids_custom_rules_file} >> + {preference name=ids_mode} >> + {preference name=ids_threshold} >> + {preference name=ids_log_to_file} >> + {*{preference name=ids_log_to_database}*} >> + </div> >> + </fieldset> >> + <fieldset class="table clearfix featurelist"> >> + <legend>{tr}Other new or Extended Features{/tr}</legend> >> + {preference name=xmpp_feature} >> + <div class="adminoptionboxchild" id="xmpp_feature_childcontainer"> >> + {preference name=xmpp_server_host} >> + {preference name=xmpp_server_http_bind} >> + {preference name=xmpp_openfire_use_token} >> + </div> >> + {preference name=feature_inline_comments} >> + {preference name=site_favicon_enable} >> + {preference name=pass_blacklist} >> + <br/><b>{tr}Console{/tr}</b>: >> + {tr}Preferences can be set{/tr}. >> + <a href="https://doc.tiki.org/Console">{tr}More Information{/tr}...</a><br/> >> + </fieldset> >> + <i>{tr}See the full list of changes{/tr}.</i> >> + <a href="https://doc.tiki.org/Tiki17" target="tikihelp" class="tikihelp" title="{tr}Tiki17:{/tr} >> + {tr}Click to read more{/tr} >> + "> >> + {icon name="help" size=1} >> + </a> >> + </div> >> +</div> >> >> Modified: trunk/tiki-wizard_admin.php >> =================================================================== >> --- trunk/tiki-wizard_admin.php 2017-06-26 14:19:46 UTC (rev 63085) >> +++ trunk/tiki-wizard_admin.php 2017-06-26 21:59:00 UTC (rev 63086) >> @@ -121,6 +121,9 @@ >> require_once('lib/wizard/pages/upgrade_new_in_16.php'); >> $pages[] = new UpgradeWizardNewIn16(); >> >> + require_once('lib/wizard/pages/upgrade_new_in_17.php'); >> + $pages[] = new UpgradeWizardNewIn17(); >> + >> require_once('lib/wizard/pages/upgrade_doc_page_iframe.php'); >> $pages[] = new UpgradeWizardDocPageIframe(); >> >> >> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >> >> >> ------------------------------------------------------------------------------ >> Check out the vibrant tech community on one of the world's most >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> > > > ------------------------------------------------------------------------------ > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |