From: <Jy...@us...> - 2009-02-28 21:31:18
|
Revision: 17011 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17011&view=rev Author: Jyhem Date: 2009-02-28 21:31:11 +0000 (Sat, 28 Feb 2009) Log Message: ----------- [FIX] If installation happens in https, the default suggestion for https config needs to be https compatible Modified Paths: -------------- branches/3.0/installer/tiki-installer.php branches/3.0/lang/fr/language.php branches/3.0/templates/tiki-install.tpl Modified: branches/3.0/installer/tiki-installer.php =================================================================== --- branches/3.0/installer/tiki-installer.php 2009-02-28 21:20:54 UTC (rev 17010) +++ branches/3.0/installer/tiki-installer.php 2009-02-28 21:31:11 UTC (rev 17011) @@ -809,6 +809,7 @@ $smarty->assign('install_step', $install_step); $smarty->assign('install_type', $install_type); $smarty->assign_by_ref('prefs', $prefs); +$smarty->assign('detected_https',$_SERVER["HTTPS"]); $mid_data = $smarty->fetch('tiki-install.tpl'); Modified: branches/3.0/lang/fr/language.php =================================================================== --- branches/3.0/lang/fr/language.php 2009-02-28 21:20:54 UTC (rev 17010) +++ branches/3.0/lang/fr/language.php 2009-02-28 21:31:11 UTC (rev 17011) @@ -569,7 +569,7 @@ "MultiTiki setup" => "Configuration MultiTiki", "To add a new virtual host" => "Ajouter un nouveau serveur virtuel", "Host:" => "Serveur :", -"Database name" => "Nom de la bnase de données", +"Database name" => "Nom de la base de données", "Connect" => "Connecter", "Reinstall database." => "Réinstaller une base de données.", "Other Options" => "Autres options", @@ -1623,28 +1623,29 @@ // "Original String" => "Original String", // "New String" => "New String", // "XML Zip" => "XML Zip", -// "Welcome to TikiWiki" => "Welcome to TikiWiki", -// "Welcome to the TikiWiki installation and upgrade script" => "Welcome to the TikiWiki installation and upgrade script", -// "Use this script to install a new TikiWiki database or upgrade your existing database to release" => "Use this script to install a new TikiWiki database or upgrade your existing database to release", -// "For the latest information about this release, please read the" => "For the latest information about this release, please read the", -// "Release Notes" => "Release Notes", -// "For complete documentation, please visit" => "For complete documentation, please visit", -// "For more information about TikiWiki, please visit" => "For more information about TikiWiki, please visit", +"Welcome to TikiWiki" => "Bienvenue à TikiWiki", +"Welcome to the TikiWiki installation and upgrade script" => "Bienvenue dans le script d'installation et mise à jour de TikiWiki", +"Use this script to install a new TikiWiki database or upgrade your existing database to release" => "Utilisez ce script pour installer une nouvelle base de données TikiWiki ou mettre à jour votre base de données pour installer", +"For the latest information about this release, please read the" => "Pour les dernières informations concernant cette release, veuillez consulter", +"Release Notes" => "Notes de release", +"For complete documentation, please visit" => "Pour une documantation complète, veuillez consulter", +"For more information about TikiWiki, please visit" => "Pour plus d'informations concernant TikiWiki, veuillez consulter", // "To run this installer in your language, use <strong>tiki-install.php?lang=XX</strong> where <strong>XX</strong> is the two-letter code for your language" => "To run this installer in your language, use <strong>tiki-install.php?lang=XX</strong> where <strong>XX</strong> is the two-letter code for your language", -// "Read the License" => "Read the License", -// "TikiWiki is software distributed under the LGPL license" => "TikiWiki is software distributed under the LGPL license", -// "Please read the following license agreement" => "Please read the following license agreement", -// "By clicking "Continue" you agree to the terms of this license" => "By clicking "Continue" you agree to the terms of this license", -// "Review the System Requirements" => "Review the System Requirements", +"Read the License" => "Lire la licence", +"TikiWiki is software distributed under the LGPL license" => "TikiWiki est un logiciel distribué sous licence LGPL", +"Please read the following license agreement" => "Veuillez consulter la licence suivante", +"By clicking "Continue" you agree to the terms of this license" => "En cliquant sur "Continuer" vous acceptez les termes de la licence", +"Review the System Requirements" => "Revoir les pré-requis systèmes", +"Select your language" => "Choisissez votre langue", // "Before installing TikiWiki, <a href=\"http://doc.tikiwiki.org/tiki-index.php?page=Requirements+and+Setup&bl=y\" target=\"_blank\">review the documentation</a> and confirm that your system meets the minimum requirements" => "Before installing TikiWiki, <a href=\"http://doc.tikiwiki.org/tiki-index.php?page=Requirements+and+Setup&bl=y\" target=\"_blank\">review the documentation</a> and confirm that your system meets the minimum requirements", -// "This installer will perform some basic checks automatically" => "This installer will perform some basic checks automatically", +"This installer will perform some basic checks automatically" => "Cet installeur va effectuer quelques controles simples automatisés", // "TikiWiki requires <strong>at least</strong> 32MB of PHP memory for script execution" => "TikiWiki requires <strong>at least</strong> 32MB of PHP memory for script execution", -// "Success" => "Success", -// "Tiki has not detected your PHP memory_limit" => "Tiki has not detected your PHP memory_limit", -// "This probably means you have no set limit (all is well)" => "This probably means you have no set limit (all is well)", -// "alert" => "alert", +"Success" => "Succès", +"Tiki has not detected your PHP memory_limit" => "Tiki n'a pas pu détecter votre limite mémoire PHP (memory_limit)", +"This probably means you have no set limit (all is well)" => "Cela signifie sans doute qu'il n'y a pas de limite (tout va bien)", +"alert" => "alerte", // "To change the memory limit, use the <strong>memory_limit</strong> key in your <strong>php.ini </strong> file (for example: memory_limit = 32M) and restart your webserver" => "To change the memory limit, use the <strong>memory_limit</strong> key in your <strong>php.ini </strong> file (for example: memory_limit = 32M) and restart your webserver", -// "Mail" => "Mail", +"Mail" => "Email", // "TikiWiki uses the PHP <strong>mail</strong> function to send email notifications and messages" => "TikiWiki uses the PHP <strong>mail</strong> function to send email notifications and messages", // "To test your system configuration, TikiWiki will attempt to send a test message to in...@ti..." => "To test your system configuration, TikiWiki will attempt to send a test message to in...@ti...", // "Send Test Message" => "Send Test Message", @@ -1653,19 +1654,19 @@ // "Review your mail log for details" => "Review your mail log for details", // "Review the mail settings in your <strong>php.ini</strong> file (for example: confirm that the <strong>sendmail_path</strong> is correct)" => "Review the mail settings in your <strong>php.ini</strong> file (for example: confirm that the <strong>sendmail_path</strong> is correct)", // "If your host requires SMTP authentication, additional configuration may be necessary" => "If your host requires SMTP authentication, additional configuration may be necessary", -// "Image Processing" => "Image Processing", -// "TikiWiki uses the GD library to process images for the Image Gallery and CAPTCHA support" => "TikiWiki uses the GD library to process images for the Image Gallery and CAPTCHA support", -// "Tiki detected" => "Tiki detected", -// "Tiki was not able to detect the GD library" => "Tiki was not able to detect the GD library", -// "Set Database Connection" => "Set Database Connection", -// "TikiWiki requires an active database connection" => "TikiWiki requires an active database connection", -// "You must create the database and user <em>before</em> completing this page" => "You must create the database and user <em>before</em> completing this page", -// "This is normal for a new installation" => "This is normal for a new installation", +"Image Processing" => "Génération d'images", +"TikiWiki uses the GD library to process images for the Image Gallery and CAPTCHA support" => "TikiWiki utilise la bibliothèque GD pour le traitement d'images pour les galleries ou la génération de CAPTCHAS (anti-spams)", +"Tiki detected" => "Tiki a détecté", +"Tiki was not able to detect the GD library" => "Tiki n'a pas réussi à détecter de bibliothèque GD", +"Set Database Connection" => "Configuration de la connexion à la base de données", +"TikiWiki requires an active database connection" => "TikiWiki a besoin d'une connexion à une base de données existante", +"You must create the database and user <em>before</em> completing this page" => "Il faut créer la base de données et son utilisateur <em>avant</em> de compléter cette page", +"This is normal for a new installation" => "Ceci est normal pour une première installation", // "information" => "information", -// "Tiki found an existing database connection in your local.php file" => "Tiki found an existing database connection in your local.php file", -// "Use Existing Connection" => "Use Existing Connection", +"Tiki found an existing database connection in your local.php file" => "Tiki a trouvé des informations de connexion à une base de données existante dans votre fichier local.php", +"Use Existing Connection" => "Utiliser la connexion existante", // "Use this page to create a new database connection" => "Use this page to create a new database connection", -// "Database information" => "Database information", +"Database information" => "Configuration de la base de données", // "Enter your database connection information" => "Enter your database connection information", // "Select the type of database to use with Tiki" => "Select the type of database to use with Tiki", // "Host name" => "Host name", @@ -1712,10 +1713,18 @@ // "MultiTiki Setup" => "MultiTiki Setup", // "Are you upgrading an existing Tiki site" => "Are you upgrading an existing Tiki site", // "Go directly to the <strong>Install/Upgrade Profile</strong> step" => "Go directly to the <strong>Install/Upgrade Profile</strong> step", -// "Welcome" => "Welcome", -// "System Requirements" => "System Requirements", -// "Database Connection" => "Database Connection", -// "Enter Tiki" => "Enter Tiki", +"Welcome" => "Bienvenue", +"System Requirements" => "Pré-requis", +"Review Upgrade" => "Revoir la mise à jour", +"Review Installation" => "Revoir l'installation", +"Database Connection" => "Connexion à la Base de Données", +"Enter Tiki" => "Accéder à Tiki", +"Install/Upgrade Profile" => "Installer/Mettre à jour un profil", +"Install Profile" => "Installer un profil", +"Support Forums" => "Forums de support", +"TikiWiki Web Site" => "Site web TikiWiki", +"Upgrade complete" => "Mise à jour terminée", +"Installation complete" => "Installation terminée", // "You can also use {literal}{content label=x}{/literal}, where x is the label of the content block" => "You can also use {literal}{content label=x}{/literal}, where x is the label of the content block", // "Edit content block" => "Edit content block", // "Create content block" => "Create content block", @@ -7068,8 +7077,8 @@ "Result" => "Résultat", "body" => "corps", "Locked" => "Verrouillé", -"Tiki installer" => "Installateur Tiki", -"Memory" => "Memoire", +"Tiki installer" => "Installation Tiki", +"Memory" => "Mémoire", "Allocating too little memory will cause TikiWiki to display blank pages" => "Une trop faible allocation de mémoire provoque l'affichage de pages blanches", "Tiki has detected your PHP memory limit at" => "Tiki a détecté que votre mémoire PHP est limitée à ", "Tiki has detected your PHP memory_limit at" => "Tiki a détecté que votre limite de mémoire PHP (memory_limit) est fixée à", Modified: branches/3.0/templates/tiki-install.tpl =================================================================== --- branches/3.0/templates/tiki-install.tpl 2009-02-28 21:20:54 UTC (rev 17010) +++ branches/3.0/templates/tiki-install.tpl 2009-02-28 21:31:11 UTC (rev 17011) @@ -328,7 +328,7 @@ {elseif $install_step eq '5' or ($dbdone ne 'n')} <h1>{tr}Review the{/tr} {if isset($smarty.post.update)}{tr}Upgrade{/tr}{else}{tr}Installation{/tr}{/if}</h1> <div style="margin: 10px 0 5px 0; border: solid 1px #000; padding: 5px; background: #a9ff9b;"> - <p style="text-align:center; font-size: large;">{if isset($smarty.post.update)}{tr}Upgrade{/tr}{else}{tr}Installation{/tr}{/if} {tr}complete{/tr}.</p> + <p style="text-align:center; font-size: large;">{if isset($smarty.post.update)}{tr}Upgrade complete{/tr}{else}{tr}Installation complete{/tr}{/if}.</p> <p>{tr}Your database has been configured and Tikiwiki is ready to run!{/tr} {if isset($smarty.post.scratch)} {tr}If this is your first install, your admin password is <strong>admin</strong>.{/tr} @@ -406,12 +406,12 @@ <select name="https_login" id="https_login" onchange="hidedisabled('httpsoptions',this.value);"> <option value="disabled"{if $prefs.https_login eq 'disabled'} selected="selected"{/if}>{tr}Disabled{/tr}</option> <option value="allowed"{if $prefs.https_login eq 'allowed'} selected="selected"{/if}>{tr}Allow secure (https) login{/tr}</option> - <option value="encouraged"{if $prefs.https_login eq 'encouraged'} selected="selected"{/if}>{tr}Encourage secure (https) login{/tr}</option> + <option value="encouraged"{if $prefs.https_login eq 'encouraged' or ($prefs.https_login eq '' and $detected_https eq 'on' ) } selected="selected"{/if}>{tr}Encourage secure (https) login{/tr}</option> <option value="force_nocheck"{if $prefs.https_login eq 'force_nocheck'} selected="selected"{/if}>{tr}Consider we are always in HTTPS, but do not check{/tr}</option> <option value="required"{if $prefs.https_login eq 'required'} selected="selected"{/if}>{tr}Require secure (https) login{/tr}</option> </select> </div> -<div id="httpsoptions" style="display:{if $prefs.https_login eq 'disabled' or $prefs.https_login eq ''}none{else}block{/if};"> +<div id="httpsoptions" style="display:{if $prefs.https_login eq 'disabled' or ( $prefs.https_login eq '' and $detected_https eq '') }none{else}block{/if};"> <div style="padding:5px"> <label for="https_port">{tr}HTTPS port{/tr}:</label> <input type="text" name="https_port" id="https_port" size="5" value="{$prefs.https_port|escape}" /> </div> @@ -536,8 +536,8 @@ <li>{if $install_step eq '1'}<strong>{else}<a href="tiki-install.php?install_step=1{if $multi}&multi={$multi}{/if}{if $lang}&lang={$lang}{/if}" title="{tr}License{/tr}">{/if}{tr}License{/tr}{if $install_step eq '1'}</strong>{else}</a>{/if}</li> <li>{if $install_step eq '2'}<strong>{elseif $install_step ge '3' or $dbcon eq 'y'}<a href="tiki-install.php?install_step=2{if $multi}&multi={$multi}{/if}{if $lang}&lang={$lang}{/if}" title="{tr}System Requirements{/tr}">{/if}{tr}System Requirements{/tr}{if $install_step eq '2'}</strong>{elseif $install_step ge '3' or $dbcon eq 'y'}</a>{/if}</li> <li>{if $install_step eq '3'}<strong>{elseif $dbcon eq 'y'}<a href="tiki-install.php?install_step=3{if $multi}&multi={$multi}{/if}{if $lang}&lang={$lang}{/if}" title="{tr}Database Connection{/tr}">{/if}{if $dbcon eq 'y'}{tr}Reset{/tr} {/if}{tr}Database Connection{/tr}{if $install_step eq '3'}</strong>{elseif $dbcon eq 'y'}</a>{/if}</li> - <li>{if $install_step eq '4'}<strong>{elseif $dbcon eq 'y' or isset($smarty.post.scratch) or isset($smarty.post.update)}<a href="tiki-install.php?install_step=4{if $multi}&multi={$multi}{/if}{if $lang}&lang={$lang}{/if}" title="{tr}Install{/tr}{if $tikidb_created} & {tr}Upgrade{/tr}{/if} {tr}Profile{/tr}">{/if}{tr}Install{/tr}{if $tikidb_created}/{tr}Upgrade{/tr}{/if} {tr}Profile{/tr}{if $install_step eq '4'}</strong>{elseif ($dbcon eq 'y') or (isset($smarty.post.scratch)) or (isset($smarty.post.update))}</a>{/if}</li> - <li>{if $install_step eq '5'}<strong>{/if}{tr}Review{/tr} {if isset($smarty.post.update)}{tr}Upgrade{/tr}{else}{tr}Installation{/tr}{/if}{if $install_step eq '5'}</strong>{/if}</li> + <li>{if $install_step eq '4'}<strong>{elseif $dbcon eq 'y' or isset($smarty.post.scratch) or isset($smarty.post.update)}<a href="tiki-install.php?install_step=4{if $multi}&multi={$multi}{/if}{if $lang}&lang={$lang}{/if}" title="{tr}Install{/tr}{if $tikidb_created} & {tr}Upgrade{/tr}{/if} {tr}Profile{/tr}">{/if}{if $tikidb_created}{tr}Install/Upgrade Profile{/tr}{else}{tr}Install Profile{/tr}{/if}{if $install_step eq '4'}</strong>{elseif ($dbcon eq 'y') or (isset($smarty.post.scratch)) or (isset($smarty.post.update))}</a>{/if}</li> + <li>{if $install_step eq '5'}<strong>{/if}{if isset($smarty.post.update)}{tr}Review Upgrade{/tr}{else}{tr}Review Installation{/tr}{/if}{if $install_step eq '5'}</strong>{/if}</li> <li>{if $install_step eq '6'}<strong>{elseif $tikidb_is20 and !isset($smarty.post.update)}<a href="tiki-install.php?install_step=6{if $multi}&multi={$multi}{/if}{if $lang}&lang={$lang}{/if}">{/if}{tr}General Settings{/tr}{if $install_step eq '6'}</strong>{elseif $tikidb_is20 and !isset($smarty.post.update)}</a>{/if}</li> <li>{if $install_step eq '7'}<strong>{elseif $tikidb_is20}<a href="tiki-install.php?install_step=7{if $multi}&multi={$multi}{/if}{if $lang}&lang={$lang}{/if}">{/if}{tr}Enter Tiki{/tr}{if $install_step eq '7'}</strong>{elseif $tikidb_is20}</a>{/if}</li> </ol> @@ -548,9 +548,9 @@ <div class="box"> <h3 class="box-title">{tr}Help{/tr}</h3> <div class="clearfix box-data"> - <p><img src="favicon.png" alt="{tr}TikiWiki{/tr}" style="vertical-align:middle;" /> <a href="http://www.tikiwiki.org" target="_blank">TikiWiki Web Site</a></p> - <p><img src="pics/icons/book_open.png" alt="{tr}Documentation{/tr}" style="vertical-align:middle;" /> <a href="http://doc.tikiwiki.org" target="_blank">Documentation</a></p> - <p><img src="pics/icons/group.png" alt="{tr}Forums{/tr}" style="vertical-align:middle;" /> <a href="http://www.tikiwiki.org/forums" target="_blank">Support Forums</a></p> + <p><img src="favicon.png" alt="{tr}TikiWiki{/tr}" style="vertical-align:middle;" /> <a href="http://www.tikiwiki.org" target="_blank">{tr}TikiWiki Web Site{/tr}</a></p> + <p><img src="pics/icons/book_open.png" alt="{tr}Documentation{/tr}" style="vertical-align:middle;" /> <a href="http://doc.tikiwiki.org" target="_blank">{tr}Documentation{/tr}</a></p> + <p><img src="pics/icons/group.png" alt="{tr}Forums{/tr}" style="vertical-align:middle;" /> <a href="http://www.tikiwiki.org/forums" target="_blank">{tr}Support Forums{/tr}</a></p> </div> </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cam...@us...> - 2009-02-28 22:55:59
|
Revision: 17014 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17014&view=rev Author: campbe13 Date: 2009-02-28 22:55:51 +0000 (Sat, 28 Feb 2009) Log Message: ----------- [Fix] check for php vers in setup Modified Paths: -------------- branches/3.0/tiki-install.php branches/3.0/tiki-setup.php Modified: branches/3.0/tiki-install.php =================================================================== --- branches/3.0/tiki-install.php 2009-02-28 22:55:06 UTC (rev 17013) +++ branches/3.0/tiki-install.php 2009-02-28 22:55:51 UTC (rev 17014) @@ -18,8 +18,8 @@ $content=''; if (version_compare(PHP_VERSION, '5.0.0', '<')) { - $title='Tiki Installer Disabled'; - $content='<p>You need at least PHP5 for Tiki 3.0</p>'; + $title='PHP5 is required for Tiki 3.0.'; + $content='Please contact your site administrator.</p>'; createPage($title,$content); } @@ -109,5 +109,3 @@ END; die; } - -?> \ No newline at end of file Modified: branches/3.0/tiki-setup.php =================================================================== --- branches/3.0/tiki-setup.php 2009-02-28 22:55:06 UTC (rev 17013) +++ branches/3.0/tiki-setup.php 2009-02-28 22:55:51 UTC (rev 17014) @@ -12,6 +12,11 @@ exit; } +if (version_compare(PHP_VERSION, '5.0.0', '<')) { + header("location: tiki-install.php"); + exit; +} + require_once 'tiki-filter-base.php'; // Enable Versioning This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Jy...@us...> - 2009-03-01 15:41:25
|
Revision: 17021 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17021&view=rev Author: Jyhem Date: 2009-03-01 15:41:08 +0000 (Sun, 01 Mar 2009) Log Message: ----------- [ENH] Translations Modified Paths: -------------- branches/3.0/lang/ar/language.php branches/3.0/lang/ca/language.php branches/3.0/lang/cn/language.php branches/3.0/lang/cs/language.php branches/3.0/lang/da/language.php branches/3.0/lang/de/language.php branches/3.0/lang/el/language.php branches/3.0/lang/en/language.php branches/3.0/lang/en-uk/language.php branches/3.0/lang/es/language.php branches/3.0/lang/fa/language.php branches/3.0/lang/fi/language.php branches/3.0/lang/fj/language.php branches/3.0/lang/fr/language.php branches/3.0/lang/gl/language.php branches/3.0/lang/he/language.php branches/3.0/lang/hr/language.php branches/3.0/lang/hu/language.php branches/3.0/lang/it/language.php branches/3.0/lang/ja/language.php branches/3.0/lang/ko/language.php branches/3.0/lang/nl/language.php branches/3.0/lang/no/language.php branches/3.0/lang/pl/language.php branches/3.0/lang/pt/language.php branches/3.0/lang/pt-br/language.php branches/3.0/lang/ru/language.php branches/3.0/lang/sb/language.php branches/3.0/lang/sk/language.php branches/3.0/lang/sr/language.php branches/3.0/lang/sr-latn/language.php branches/3.0/lang/sv/language.php branches/3.0/lang/tv/language.php branches/3.0/lang/tw/language.php branches/3.0/lang/uk/language.php branches/3.0/lib/wiki-plugins/wikiplugin_aname.php Modified: branches/3.0/lang/ar/language.php =================================================================== --- branches/3.0/lang/ar/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/ar/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -926,7 +926,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/ca/language.php =================================================================== --- branches/3.0/lang/ca/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/ca/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -2320,7 +2320,7 @@ // "The anchor name as defined in the ANAME plugin." => "The anchor name as defined in the ANAME plugin.", // "The name of the wiki page containing the anchor." => "The name of the wiki page containing the anchor.", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Image Annotation" => "Image Annotation", // "Autogenerated content. Leave blank initially." => "Autogenerated content. Leave blank initially.", Modified: branches/3.0/lang/cn/language.php =================================================================== --- branches/3.0/lang/cn/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/cn/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -2292,7 +2292,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/cs/language.php =================================================================== --- branches/3.0/lang/cs/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/cs/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1519,7 +1519,7 @@ // "The anchor name as defined in the ANAME plugin." => "The anchor name as defined in the ANAME plugin.", // "The name of the wiki page containing the anchor." => "The name of the wiki page containing the anchor.", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Image Annotation" => "Image Annotation", // "Autogenerated content. Leave blank initially." => "Autogenerated content. Leave blank initially.", Modified: branches/3.0/lang/da/language.php =================================================================== --- branches/3.0/lang/da/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/da/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1418,7 +1418,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/de/language.php =================================================================== --- branches/3.0/lang/de/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/de/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1455,7 +1455,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/el/language.php =================================================================== --- branches/3.0/lang/el/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/el/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1004,7 +1004,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/en/language.php =================================================================== --- branches/3.0/lang/en/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/en/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -939,7 +939,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/en-uk/language.php =================================================================== --- branches/3.0/lang/en-uk/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/en-uk/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -943,7 +943,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/es/language.php =================================================================== --- branches/3.0/lang/es/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/es/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1645,7 +1645,7 @@ // "The anchor name as defined in the ANAME plugin." => "The anchor name as defined in the ANAME plugin.", // "The name of the wiki page containing the anchor." => "The name of the wiki page containing the anchor.", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Image Annotation" => "Image Annotation", // "Autogenerated content. Leave blank initially." => "Autogenerated content. Leave blank initially.", Modified: branches/3.0/lang/fa/language.php =================================================================== --- branches/3.0/lang/fa/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/fa/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1719,7 +1719,7 @@ // "The anchor name as defined in the ANAME plugin." => "The anchor name as defined in the ANAME plugin.", // "The name of the wiki page containing the anchor." => "The name of the wiki page containing the anchor.", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Image Annotation" => "Image Annotation", // "Autogenerated content. Leave blank initially." => "Autogenerated content. Leave blank initially.", Modified: branches/3.0/lang/fi/language.php =================================================================== --- branches/3.0/lang/fi/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/fi/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1937,7 +1937,7 @@ // "The anchor name as defined in the ANAME plugin." => "The anchor name as defined in the ANAME plugin.", // "The name of the wiki page containing the anchor." => "The name of the wiki page containing the anchor.", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Image Annotation" => "Image Annotation", // "Autogenerated content. Leave blank initially." => "Autogenerated content. Leave blank initially.", Modified: branches/3.0/lang/fj/language.php =================================================================== --- branches/3.0/lang/fj/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/fj/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -762,7 +762,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/fr/language.php =================================================================== --- branches/3.0/lang/fr/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/fr/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -558,7 +558,7 @@ "__WARNING__: Plugin disabled \$plugin" => "__Avertissement__: Le Plugin \$plugin est désactivé", "Autogenerated content. Leave blank initially" => "Contenu généré automatiquement. Laisser vide initialement", "Image annotations changed" => "Les annotations sur l'image ont été modifiées", -"Creates an annotation block for an image" => "Créé un bloc d'annotations pour une image", +"Creates an annotation block for an image" => "Crée un bloc d'annotations pour une image", "The amount of articles to display in the list" => "Nombre d'articles à afficher dans la liste", "The name of the topic" => "Nom du sujet", "The ID of the topic" => "ID du sujet", @@ -576,7 +576,7 @@ "Reset database connection settings" => "Réinitialiser les paramètres de connexion base de données", "Important Information" => "Information importante", "Please read the following notes before entering Tikiwiki." => "Merci de lire les notes suivantes avant d'entrer dans Tikiwiki.", -"Tiki has not detected your PHP memory_limit. This probably means you have no set limit (all is well)" => "Tiki n'a pas pu détecté une limite de la mémoire PHP. Cela veut probablement dire que vous n'avez pas de limite ( parfait!)", +"Tiki has not detected your PHP memory_limit. This probably means you have no set limit (all is well)" => "Tiki n'a pas pu détecter une limite de la mémoire PHP. Cela veut probablement dire que vous n'avez pas de limite ( parfait! )", "Entering TikiWiki" => "Entrer dans TikiWiki", "Do not use your browser's Back button." => "Ne pas utiliser le bouton 'Retour' de votre navigateur.", "Please wait 2 minutes between posts" => "SVP respectez un délai de 2 minutes entre chaque publication", @@ -662,7 +662,7 @@ // "The anchor name as defined in the ANAME plugin" => "The anchor name as defined in the ANAME plugin", // "The name of the wiki page containing the anchor" => "The name of the wiki page containing the anchor", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin" => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin. => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin., // "The name of the anchor" => "The name of the anchor", // "Absolute URL to the image or relative path from tikiwiki root" => "Absolute URL to the image or relative path from tikiwiki root", // "Displays an image and allow the users to define zones to highlight information on the image" => "Displays an image and allow the users to define zones to highlight information on the image", @@ -1711,7 +1711,7 @@ // "TikiWiki is an opensource project, <em>you</em> can <a href='http://info.tikiwiki.org/Join+the+Community' target='_blank'>join the community</a> and help <a href='http://info.tikiwiki.org/tiki-index.php?page=Develop+Tiki' target='_blank'>develop Tiki</a>" => "TikiWiki is an opensource project, <em>you</em> can <a href='http://info.tikiwiki.org/Join+the+Community' target='_blank'>join the community</a> and help <a href='http://info.tikiwiki.org/tiki-index.php?page=Develop+Tiki' target='_blank'>develop Tiki</a>", // "Lock installer and enter Tiki" => "Lock installer and enter Tiki", // "MultiTiki Setup" => "MultiTiki Setup", -// "Are you upgrading an existing Tiki site" => "Are you upgrading an existing Tiki site", +"Are you upgrading an existing Tiki site" => "Voulez-vous mettre à jour une installation TikiWiki existante", // "Go directly to the <strong>Install/Upgrade Profile</strong> step" => "Go directly to the <strong>Install/Upgrade Profile</strong> step", "Welcome" => "Bienvenue", "System Requirements" => "Pré-requis", Modified: branches/3.0/lang/gl/language.php =================================================================== --- branches/3.0/lang/gl/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/gl/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1609,7 +1609,7 @@ // "The anchor name as defined in the ANAME plugin." => "The anchor name as defined in the ANAME plugin.", // "The name of the wiki page containing the anchor." => "The name of the wiki page containing the anchor.", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Image Annotation" => "Image Annotation", // "Autogenerated content. Leave blank initially." => "Autogenerated content. Leave blank initially.", Modified: branches/3.0/lang/he/language.php =================================================================== --- branches/3.0/lang/he/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/he/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1340,7 +1340,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/hr/language.php =================================================================== (Binary files differ) Modified: branches/3.0/lang/hu/language.php =================================================================== --- branches/3.0/lang/hu/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/hu/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1112,7 +1112,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/it/language.php =================================================================== --- branches/3.0/lang/it/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/it/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1580,7 +1580,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/ja/language.php =================================================================== --- branches/3.0/lang/ja/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/ja/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1428,7 +1428,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/ko/language.php =================================================================== --- branches/3.0/lang/ko/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/ko/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1058,7 +1058,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/nl/language.php =================================================================== --- branches/3.0/lang/nl/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/nl/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1523,7 +1523,7 @@ // "The anchor name as defined in the ANAME plugin." => "The anchor name as defined in the ANAME plugin.", // "The name of the wiki page containing the anchor." => "The name of the wiki page containing the anchor.", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Image Annotation" => "Image Annotation", // "Autogenerated content. Leave blank initially." => "Autogenerated content. Leave blank initially.", Modified: branches/3.0/lang/no/language.php =================================================================== --- branches/3.0/lang/no/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/no/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -937,7 +937,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/pl/language.php =================================================================== --- branches/3.0/lang/pl/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/pl/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1458,7 +1458,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/pt/language.php =================================================================== --- branches/3.0/lang/pt/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/pt/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1733,7 +1733,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/pt-br/language.php =================================================================== --- branches/3.0/lang/pt-br/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/pt-br/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1816,7 +1816,7 @@ // "The anchor name as defined in the ANAME plugin." => "The anchor name as defined in the ANAME plugin.", // "The name of the wiki page containing the anchor." => "The name of the wiki page containing the anchor.", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Image Annotation" => "Image Annotation", // "Autogenerated content. Leave blank initially." => "Autogenerated content. Leave blank initially.", Modified: branches/3.0/lang/ru/language.php =================================================================== --- branches/3.0/lang/ru/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/ru/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1530,7 +1530,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/sb/language.php =================================================================== --- branches/3.0/lang/sb/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/sb/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1614,7 +1614,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/sk/language.php =================================================================== --- branches/3.0/lang/sk/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/sk/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1466,7 +1466,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/sr/language.php =================================================================== --- branches/3.0/lang/sr/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/sr/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -937,7 +937,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/sr-latn/language.php =================================================================== --- branches/3.0/lang/sr-latn/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/sr-latn/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1584,7 +1584,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/sv/language.php =================================================================== --- branches/3.0/lang/sv/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/sv/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1717,7 +1717,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/tv/language.php =================================================================== --- branches/3.0/lang/tv/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/tv/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -952,7 +952,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/tw/language.php =================================================================== --- branches/3.0/lang/tw/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/tw/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1630,7 +1630,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lang/uk/language.php =================================================================== --- branches/3.0/lang/uk/language.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lang/uk/language.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -1541,7 +1541,7 @@ // "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor" => "Puts a link to an anchor in a wiki page. Use in conjunction with the ANAME plugin, which sets the location and name of the anchor", // "linktext" => "linktext", // "Anchor Name" => "Anchor Name", -// "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.", +// "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin." => "Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.", // "The name of the anchor." => "The name of the anchor.", // "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor" => "Puts an anchor into a wiki page. Use in conjunction with the ALINK plugin, which makes links to the anchor", // "Image Annotation" => "Image Annotation", Modified: branches/3.0/lib/wiki-plugins/wikiplugin_aname.php =================================================================== --- branches/3.0/lib/wiki-plugins/wikiplugin_aname.php 2009-03-01 15:37:21 UTC (rev 17020) +++ branches/3.0/lib/wiki-plugins/wikiplugin_aname.php 2009-03-01 15:41:08 UTC (rev 17021) @@ -25,7 +25,7 @@ return array( 'name' => tra('Anchor Name'), 'documentation' => 'PluginAname', - 'description' => tra('Inserts an anchor in th wiki page. Anchors can be linked to using the ALINK plugin.'), + 'description' => tra('Inserts an anchor in the wiki page. Anchors can be linked to using the ALINK plugin.'), 'prefs' => array('wikiplugin_aname'), 'body' => tra('The name of the anchor.'), 'params' => array(), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chi...@us...> - 2009-03-01 17:11:00
|
Revision: 17024 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17024&view=rev Author: chibaguy Date: 2009-03-01 17:10:48 +0000 (Sun, 01 Mar 2009) Log Message: ----------- [FIX] Browser title and page-top (L&F) title still interfering with each other. Browser title variable changed and admin moved from admin general to look and feel. This is partial fix; browser title still using prefs value despite new input on admin L&F. Modified Paths: -------------- branches/3.0/lib/setup/prefs.php branches/3.0/templates/header.tpl branches/3.0/templates/tiki-admin-include-general.tpl branches/3.0/templates/tiki-admin-include-look.tpl branches/3.0/tiki-admin_include_look.php Modified: branches/3.0/lib/setup/prefs.php =================================================================== --- branches/3.0/lib/setup/prefs.php 2009-03-01 16:13:12 UTC (rev 17023) +++ branches/3.0/lib/setup/prefs.php 2009-03-01 17:10:48 UTC (rev 17024) @@ -946,7 +946,7 @@ 'feature_actionlog_bytes' => 'n', // admin - 'siteTitle' => 'Tiki 3.0', + 'browsertitle' => 'Tiki 3.0', 'tmpDir' => 'temp', // tell a friend Modified: branches/3.0/templates/header.tpl =================================================================== --- branches/3.0/templates/header.tpl 2009-03-01 16:13:12 UTC (rev 17023) +++ branches/3.0/templates/header.tpl 2009-03-01 17:10:48 UTC (rev 17024) @@ -36,7 +36,7 @@ <title> {if isset($trail)}{breadcrumbs type="fulltrail" loc="head" crumbs=$trail} {else} -{$prefs.siteTitle} +{$prefs.browsertitle} {if !empty($headtitle)} : {$headtitle} {elseif !empty($page)} : {if $beingStaged eq 'y' and $prefs.wikiapproval_hideprefix == 'y'}{$approvedPageName|escape}{else}{$page|escape}{/if} {* add $description|escape if you want to put the description + update breadcrumb_build replace return $crumbs->title; with return empty($crumbs->description)? $crumbs->title: $crumbs->description; *} {elseif !empty($arttitle)} : {$arttitle} Modified: branches/3.0/templates/tiki-admin-include-general.tpl =================================================================== --- branches/3.0/templates/tiki-admin-include-general.tpl 2009-03-01 16:13:12 UTC (rev 17023) +++ branches/3.0/templates/tiki-admin-include-general.tpl 2009-03-01 17:10:48 UTC (rev 17024) @@ -272,9 +272,6 @@ <div align="left"><label for="general-pageviews">{tr}Count admin pageviews{/tr}</label>.</div> </div> <div style="padding:.5em;clear:both"> - <div align="left"><label for="general-browser_title">{tr}Browser title{/tr}:</label><br /><input type="text" name="siteTitle" id="general-browser_title" value="{$prefs.siteTitle|escape}" size="50" /></div> -</div> -<div style="padding:.5em;clear:both"> <div align="left"><label for="general-temp">{tr}Temporary directory{/tr}:</label><br /><input type="text" name="tmpDir" id="general-temp" value="{$prefs.tmpDir|escape}" size="50" /></div> </div> <div style="padding:.5em;clear:both"> Modified: branches/3.0/templates/tiki-admin-include-look.tpl =================================================================== --- branches/3.0/templates/tiki-admin-include-look.tpl 2009-03-01 16:13:12 UTC (rev 17023) +++ branches/3.0/templates/tiki-admin-include-look.tpl 2009-03-01 17:10:48 UTC (rev 17024) @@ -694,6 +694,9 @@ </legend> <div id="other" style="display:{if !isset($smarty.session.tiki_cookie_jar.show_other) and $smarty.session.tiki_cookie_jar.show_other neq 'y'}none{else}block{/if};"> {/if} + <div> + <div style="text-align: left"><label for="browsertitle">{tr}Browser title{/tr}:</label> <input type="text" name="browsertitle" id="browsertitle" value="{$prefs.browsertitle|escape}" size="50" /></div> +</div> <div class="clear floatleft"> <input type="checkbox" id="use_context_menu_icon" name="use_context_menu_icon" {if $prefs.use_context_menu_icon eq 'y'}checked="checked"{/if} /> <label for="use_context_menu_icon">{tr}Use context menus for actions (icons) (only in file galleries yet){/tr}</label> Modified: branches/3.0/tiki-admin_include_look.php =================================================================== --- branches/3.0/tiki-admin_include_look.php 2009-03-01 16:13:12 UTC (rev 17023) +++ branches/3.0/tiki-admin_include_look.php 2009-03-01 17:10:48 UTC (rev 17024) @@ -110,7 +110,8 @@ "feature_siteloc", "feature_sitetitle", "feature_sitedesc", - "sitelogo_align" + "sitelogo_align", + "browsertitle", ); foreach ($pref_byref_values as $britem) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-01 21:28:02
|
Revision: 17035 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17035&view=rev Author: luciash Date: 2009-03-01 21:27:49 +0000 (Sun, 01 Mar 2009) Log Message: ----------- [MOD] preferences: siteTitle -> browsertitle Modified Paths: -------------- branches/3.0/db/features.csv branches/3.0/db/profiles/basicEnabled.prf branches/3.0/installer/tiki-installer.php branches/3.0/lib/groupalert/groupalertlib.php branches/3.0/lib/rss/rsslib.php branches/3.0/lib/setup/breadcrumb.php branches/3.0/templates/header_simple.tpl branches/3.0/tiki-register_site.php branches/3.0/tiki-setup.php branches/3.0/tiki-setup_base.php Property Changed: ---------------- branches/3.0/lib/groupalert/groupalertlib.php branches/3.0/lib/rss/rsslib.php Modified: branches/3.0/db/features.csv =================================================================== --- branches/3.0/db/features.csv 2009-03-01 21:23:36 UTC (rev 17034) +++ branches/3.0/db/features.csv 2009-03-01 21:27:49 UTC (rev 17035) @@ -352,7 +352,7 @@ 431,Proxy Host,1009,,proxy_host,simple,,tiki_p_admin,-9,,,,, 432,Long date format,48,,long_date_format,byref,,tiki_p_admin,,,Time+and+Date,Sample: {$now|tiki_long_date},, 433,Short date format,48,,short_date_format,byref,,tiki_p_admin,,,Time+and+Date,Sample: {$now|tiki_short_date},, -434,Site Title,876,,siteTitle,byref,,tiki_p_admin,,,,Will display in the browser's titlebar. ,,What is difference with sitetitle? +434,Site Title,876,,browsertitle,byref,,tiki_p_admin,,,,Will display in the browser's titlebar. ,,What is difference with sitetitle? 435,Short time format,48,,short_time_format,byref,,tiki_p_admin,,,Time+and+Date,Sample: {$now|tiki_short_time},, 436,Contact user,1000,,contact_user,simple,,tiki_p_admin,,,,,, 437,Store session in database,859,,session_db,flag,,tiki_p_admin,,,,,, Modified: branches/3.0/db/profiles/basicEnabled.prf =================================================================== --- branches/3.0/db/profiles/basicEnabled.prf 2009-03-01 21:23:36 UTC (rev 17034) +++ branches/3.0/db/profiles/basicEnabled.prf 2009-03-01 21:27:49 UTC (rev 17035) @@ -81,7 +81,7 @@ REPLACE INTO tiki_preferences VALUES ('rssfeed_webmaster',''); REPLACE INTO tiki_preferences VALUES ('session_db','n'); REPLACE INTO tiki_preferences VALUES ('session_lifetime','0'); -REPLACE INTO tiki_preferences VALUES ('siteTitle','Tikiwiki'); +REPLACE INTO tiki_preferences VALUES ('browsertitle','Tiki 3.0'); REPLACE INTO tiki_preferences VALUES ('site_busy_msg','Server is currently too busy, please come back later.'); REPLACE INTO tiki_preferences VALUES ('site_closed','n'); REPLACE INTO tiki_preferences VALUES ('site_closed_msg','Site is closed for maintenance, please come back later.'); Modified: branches/3.0/installer/tiki-installer.php =================================================================== --- branches/3.0/installer/tiki-installer.php 2009-03-01 21:23:36 UTC (rev 17034) +++ branches/3.0/installer/tiki-installer.php 2009-03-01 21:27:49 UTC (rev 17035) @@ -796,7 +796,7 @@ // write general settings if (($_REQUEST['general_settings']) == 'y') { global $dbTiki; -$query = "INSERT INTO `tiki_preferences` (`name`, `value`) VALUES ('siteTitle', '".$_REQUEST['site_title']."'), ('sender_email', '".$_REQUEST['sender_email']."'), ('https_login', '".$_REQUEST['https_login']."'), ('https_port', '".$_REQUEST['https_port']."'), ('feature_swtich_ssl_mode', '".$_REQUEST['feature_switch_ssl_mode']."'), ('feature_show_stay_in_ssl_mode', '".$_REQUEST['feature_show_stay_in_ssl_mode']."')"; +$query = "INSERT INTO `tiki_preferences` (`name`, `value`) VALUES ('browsertitle', '".$_REQUEST['site_title']."'), ('sender_email', '".$_REQUEST['sender_email']."'), ('https_login', '".$_REQUEST['https_login']."'), ('https_port', '".$_REQUEST['https_port']."'), ('feature_swtich_ssl_mode', '".$_REQUEST['feature_switch_ssl_mode']."'), ('feature_show_stay_in_ssl_mode', '".$_REQUEST['feature_show_stay_in_ssl_mode']."')"; $query .= ";UPDATE `users_users` SET `email` = '".$_REQUEST['admin_email']."' WHERE `users_users`.`userId` =1"; $dbTiki->Execute($query); } Modified: branches/3.0/lib/groupalert/groupalertlib.php =================================================================== --- branches/3.0/lib/groupalert/groupalertlib.php 2009-03-01 21:23:36 UTC (rev 17034) +++ branches/3.0/lib/groupalert/groupalertlib.php 2009-03-01 21:27:49 UTC (rev 17035) @@ -1,4 +1,6 @@ <?php +// $Id$ + /* groupalert is used to select user of groups to send alert email (groupware notification) */ @@ -41,7 +43,7 @@ if (!is_array($ListUserToAlert)) { return; } - $project=$tikilib->get_preference ("siteTitle"); + $project=$tikilib->get_preference ("browsertitle"); $foo = parse_url($_SERVER["REQUEST_URI"]); $machine = $tikilib->httpPrefix() . dirname( $foo["path"] ); $URL=$machine."/".$URI; Property changes on: branches/3.0/lib/groupalert/groupalertlib.php ___________________________________________________________________ Added: svn:keywords + Id Modified: branches/3.0/lib/rss/rsslib.php =================================================================== --- branches/3.0/lib/rss/rsslib.php 2009-03-01 21:23:36 UTC (rev 17034) +++ branches/3.0/lib/rss/rsslib.php 2009-03-01 21:27:49 UTC (rev 17035) @@ -1,4 +1,5 @@ <?php +// $Id$ //this script may only be included - so its better to die if called directly. if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) { @@ -304,10 +305,10 @@ $rss->feedURL = $url; $image = new FeedImage(); - $image->title = $prefs['siteTitle']; + $image->title = $prefs['browsertitle']; $image->url = $img; $image->link = $home; - $image->description = sprintf(tra('Feed provided by %s. Click to visit.'), $prefs['siteTitle']); + $image->description = sprintf(tra('Feed provided by %s. Click to visit.'), $prefs['browsertitle']); //optional $image->descriptionTruncSize = 500; Property changes on: branches/3.0/lib/rss/rsslib.php ___________________________________________________________________ Added: svn:keywords + Id Modified: branches/3.0/lib/setup/breadcrumb.php =================================================================== --- branches/3.0/lib/setup/breadcrumb.php 2009-03-01 21:23:36 UTC (rev 17034) +++ branches/3.0/lib/setup/breadcrumb.php 2009-03-01 21:27:49 UTC (rev 17035) @@ -11,5 +11,5 @@ // setup initial breadcrumb $crumbs = array(); -$crumbs[] = new Breadcrumb($prefs['siteTitle'], '', $prefs['tikiIndex']); +$crumbs[] = new Breadcrumb($prefs['browsertitle'], '', $prefs['tikiIndex']); $smarty->assign_by_ref('crumbs', $crumbs); Modified: branches/3.0/templates/header_simple.tpl =================================================================== --- branches/3.0/templates/header_simple.tpl 2009-03-01 21:23:36 UTC (rev 17034) +++ branches/3.0/templates/header_simple.tpl 2009-03-01 21:27:49 UTC (rev 17035) @@ -25,7 +25,7 @@ <title> {if isset($trail)}{breadcrumbs type="fulltrail" loc="head" crumbs=$trail} {else} -{$prefs.siteTitle} +{$prefs.browsertitle} {if !empty($headtitle)} : {$headtitle} {elseif !empty($page)} : {if $beingStaged eq 'y' and $prefs.wikiapproval_hideprefix == 'y'}{$approvedPageName|escape}{else}{$page|escape}{/if} {* add $description|escape if you want to put the description + update breadcrumb_build replace return $crumbs->title; with return empty($crumbs->description)? $crumbs->title: $crumbs->description; *} {elseif !empty($arttitle)} : {$arttitle} Modified: branches/3.0/tiki-register_site.php =================================================================== --- branches/3.0/tiki-register_site.php 2009-03-01 21:23:36 UTC (rev 17034) +++ branches/3.0/tiki-register_site.php 2009-03-01 21:27:49 UTC (rev 17035) @@ -20,7 +20,7 @@ $url = $tmp1.dirname($tmp2); $info = Array(); -$info["name"] = $prefs['siteTitle']; +$info["name"] = $prefs['browsertitle']; $info["description"] = ''; $info["url"] = $url; $info["country"] = 'None'; Modified: branches/3.0/tiki-setup.php =================================================================== --- branches/3.0/tiki-setup.php 2009-03-01 21:23:36 UTC (rev 17034) +++ branches/3.0/tiki-setup.php 2009-03-01 21:27:49 UTC (rev 17035) @@ -43,7 +43,7 @@ if ($prefs['feature_tikitests'] == 'y' and version_compare(PHP_VERSION, '5.0.0', '>=')) { require_once('tiki_tests/tikitestslib.php'); } -$crumbs[] = new Breadcrumb($prefs['siteTitle'], '', $prefs['tikiIndex']); +$crumbs[] = new Breadcrumb($prefs['browsertitle'], '', $prefs['tikiIndex']); if ( $prefs['site_closed'] == 'y' ) require_once('lib/setup/site_closed.php'); require_once('lib/setup/error_reporting.php'); Modified: branches/3.0/tiki-setup_base.php =================================================================== --- branches/3.0/tiki-setup_base.php 2009-03-01 21:23:36 UTC (rev 17034) +++ branches/3.0/tiki-setup_base.php 2009-03-01 21:27:49 UTC (rev 17035) @@ -274,7 +274,7 @@ // in the case of tikis on same domain we have to distinguish the realm -// changed cookie and session variable name by a name made with siteTitle +// changed cookie and session variable name by a name made with browsertitle $cookie_site = ereg_replace("[^a-zA-Z0-9]", "", $prefs['cookie_name']); $user_cookie_site = 'tiki-user-'.$cookie_site; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-01 21:32:14
|
Revision: 17037 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17037&view=rev Author: luciash Date: 2009-03-01 21:32:05 +0000 (Sun, 01 Mar 2009) Log Message: ----------- [MOD] preferences: siteTitle -> browsertitle + put it on General under Site Identity fieldset + link for more site customization to L&F + one tab less (moving the version check) Modified Paths: -------------- branches/3.0/templates/tiki-admin-include-general.tpl branches/3.0/tiki-admin_include_general.php Modified: branches/3.0/templates/tiki-admin-include-general.tpl =================================================================== --- branches/3.0/templates/tiki-admin-include-general.tpl 2009-03-01 21:31:19 UTC (rev 17036) +++ branches/3.0/templates/tiki-admin-include-general.tpl 2009-03-01 21:32:05 UTC (rev 17037) @@ -14,7 +14,6 @@ {tabs}{strip} {tr}General Preferences{/tr}| {tr}General Settings{/tr}| - {tr}Release check{/tr}| {tr}Date and Time Formats{/tr}| {tr}Admin Password{/tr} {/strip}{/tabs} @@ -33,9 +32,42 @@ {/if} <h2>{tr}General Preferences{/tr}</h2> -<div style="padding:.5em;" align="left">{tr}Tikiwiki version{/tr}: <strong>{$tiki_version}</strong> - {button href="tiki-install.php" _text="{tr}Reset or upgrade your database{/tr}"} + + + <fieldset> + <legend>{tr}Release Check{/tr}</legend> + + <div style="padding:.5em;">{tr}Tiki version{/tr}: <strong>{$tiki_version}</strong> + {button href="tiki-install.php" _text="{tr}Reset or upgrade your database{/tr}"} + </div> + + <div style="padding:.5em;"> + <div style="float:left;padding-right:1em;"><input type="checkbox" id="general-versioncheck" name="feature_version_checks" {if $prefs.feature_version_checks eq 'y'}checked="checked" {/if}onclick="flip('check_for_updates');" /></div> + <div align="left"><label for="general-versioncheck">{tr}Check for updates automatically{/tr}.</label></div> + <div align="left" id="check_for_updates" style="display:{if $prefs.feature_version_checks eq 'y'}block{else}none{/if};margin-left:30px;padding:.5em;"> + <div>{tr}Check frequency{/tr}: + <select name="tiki_version_check_frequency"> + <option value="86400"{if $prefs.tiki_version_check_frequency eq 86400} selected="selected"{/if}>{tr}Each day{/tr}</option> + <option value="604800"{if $prefs.tiki_version_check_frequency eq 604800} selected="selected"{/if}>{tr}Each week{/tr}</option> + <option value="2592000"{if $prefs.tiki_version_check_frequency eq 2592000} selected="selected"{/if}>{tr}Each month{/tr}</option> + </select> + </div> + <em>{tr}TikiWiki will check for updates when you access the main Administration page{/tr}.</em> + </div> </div> + + <div style="padding:.5em"> +{button href="tiki-admin.php?page=general&forcecheck=1" _text="{tr}Check for updates now{/tr}."} + </div> + </fieldset> + + <fieldset> + <legend>{tr}Site Identity{/tr}</legend> + <div style="text-align: left"><label for="browsertitle">{tr}Browser title{/tr}:</label> <input type="text" name="browsertitle" id="browsertitle" value="{$prefs.browsertitle|escape}" size="50" /></div> + + <div style="padding:.5em;clear:both">{tr}Go to <a href="tiki-admin.php?page=look" title=""><strong>Look & Feel</strong></a> section for additional site related customization preferences{/tr}. + </fieldset> + <fieldset><legend>{tr}Home Page{/tr}</legend> <div style="padding:.5em;clear:both"> <div style="float:left;padding-right:1em;"><input type="checkbox" name="useGroupHome" id="general-homepages"{if $prefs.useGroupHome eq 'y'} checked="checked"{/if} onclick="flip('group_homepages');" /></div> @@ -335,43 +367,6 @@ </fieldset> - <fieldset{if $prefs.feature_tabs eq 'y'} class="tabcontent" id="content{cycle name=content assign=focustab}{$focustab}"{/if}> - {if $prefs.feature_tabs neq 'y'} - <legend class="heading" id="tab{cycle name=tabs advance=false assign=tabi}{$tabi}"> - <a href="#layout" onclick="flip('layout'); return false;"> - <span>{tr}Release Check{/tr}</span> - </a> - </legend> - <div id="layout" style="display:{if !isset($smarty.session.tiki_cookie_jar.show_layout) and $smarty.session.tiki_cookie_jar.show_layout neq 'y'}none{else}block{/if};">{/if} - -<h2>{tr}Release Check{/tr}</h2> - -<div style="padding:.5em;"> - <div align="left">{tr}TikiWiki version{/tr}: {$tiki_version}</div> -</div> - -<div style="padding:.5em;"> - <div style="float:left;padding-right:1em;"><input type="checkbox" id="general-versioncheck" name="feature_version_checks" {if $prefs.feature_version_checks eq 'y'}checked="checked" {/if}onclick="flip('check_for_updates');" /></div> - <div align="left"><label for="general-versioncheck">{tr}Check for updates automatically{/tr}.</label></div> - <div align="left" id="check_for_updates" style="display:{if $prefs.feature_version_checks eq 'y'}block{else}none{/if};margin-left:30px;padding:.5em;"> - <div>{tr}Check frequency{/tr}: - <select name="tiki_version_check_frequency"> - <option value="86400"{if $prefs.tiki_version_check_frequency eq 86400} selected="selected"{/if}>{tr}Each day{/tr}</option> - <option value="604800"{if $prefs.tiki_version_check_frequency eq 604800} selected="selected"{/if}>{tr}Each week{/tr}</option> - <option value="2592000"{if $prefs.tiki_version_check_frequency eq 2592000} selected="selected"{/if}>{tr}Each month{/tr}</option> - </select> - </div> - <em>{tr}TikiWiki will check for updates when you access the main Administration page{/tr}.</em> - </div> -</div> - -<div style="padding:.5em"> -{button href="tiki-admin.php?page=general&forcecheck=1" _text="{tr}Check for updates now{/tr}."} -</div> - - - {if $prefs.feature_tabs neq 'y'}</div>{/if} - </fieldset> <fieldset{if $prefs.feature_tabs eq 'y'} class="tabcontent" id="content{cycle name=content assign=focustab}{$focustab}"{/if}> Modified: branches/3.0/tiki-admin_include_general.php =================================================================== --- branches/3.0/tiki-admin_include_general.php 2009-03-01 21:31:19 UTC (rev 17036) +++ branches/3.0/tiki-admin_include_general.php 2009-03-01 21:32:05 UTC (rev 17037) @@ -64,6 +64,7 @@ } $pref_simple_values = array( + "browsertitle", "site_crumb_seper", "site_nav_seper", "contact_user", @@ -76,7 +77,7 @@ "urlIndex", "proxy_host", "proxy_port", - "ip_can_be_checked", + "ip_can_be_checked", "session_lifetime", "load_threshold", "site_busy_msg", @@ -101,9 +102,8 @@ "long_time_format", "short_date_format", "short_time_format", - "siteTitle", "tikiIndex", - "users_prefs_display_timezone" + "users_prefs_display_timezone" ); foreach ($pref_byref_values as $britem) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-01 21:39:40
|
Revision: 17039 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17039&view=rev Author: luciash Date: 2009-03-01 21:39:26 +0000 (Sun, 01 Mar 2009) Log Message: ----------- [MOD] browsertitle moved back to general prefs Modified Paths: -------------- branches/3.0/templates/tiki-admin-include-look.tpl branches/3.0/tiki-admin_include_look.php Modified: branches/3.0/templates/tiki-admin-include-look.tpl =================================================================== --- branches/3.0/templates/tiki-admin-include-look.tpl 2009-03-01 21:38:24 UTC (rev 17038) +++ branches/3.0/templates/tiki-admin-include-look.tpl 2009-03-01 21:39:26 UTC (rev 17039) @@ -694,9 +694,7 @@ </legend> <div id="other" style="display:{if !isset($smarty.session.tiki_cookie_jar.show_other) and $smarty.session.tiki_cookie_jar.show_other neq 'y'}none{else}block{/if};"> {/if} - <div> - <div style="text-align: left"><label for="browsertitle">{tr}Browser title{/tr}:</label> <input type="text" name="browsertitle" id="browsertitle" value="{$prefs.browsertitle|escape}" size="50" /></div> -</div> + <div class="clear floatleft"> <input type="checkbox" id="use_context_menu_icon" name="use_context_menu_icon" {if $prefs.use_context_menu_icon eq 'y'}checked="checked"{/if} /> <label for="use_context_menu_icon">{tr}Use context menus for actions (icons) (only in file galleries yet){/tr}</label> Modified: branches/3.0/tiki-admin_include_look.php =================================================================== --- branches/3.0/tiki-admin_include_look.php 2009-03-01 21:38:24 UTC (rev 17038) +++ branches/3.0/tiki-admin_include_look.php 2009-03-01 21:39:26 UTC (rev 17039) @@ -111,7 +111,6 @@ "feature_sitetitle", "feature_sitedesc", "sitelogo_align", - "browsertitle", ); foreach ($pref_byref_values as $britem) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2009-03-01 23:04:56
|
Revision: 17043 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17043&view=rev Author: nkoth Date: 2009-03-01 23:04:54 +0000 (Sun, 01 Mar 2009) Log Message: ----------- [FIX] add permission/includeonly checks on files Modified Paths: -------------- branches/3.0/doc/devtools/securitycheck.php branches/3.0/modules/mod-semantic_links.php Modified: branches/3.0/doc/devtools/securitycheck.php =================================================================== --- branches/3.0/doc/devtools/securitycheck.php 2009-03-01 23:01:45 UTC (rev 17042) +++ branches/3.0/doc/devtools/securitycheck.php 2009-03-01 23:04:54 UTC (rev 17043) @@ -80,9 +80,16 @@ return "/strpos\s*\(\s*\\\$_SERVER\s*\[\s*[\"']SCRIPT_NAME[\"']\s*\]\s*,\s*basename\s*\(\s*__FILE__\s*\)\s*\)\s*!==\s*(false|FALSE)/"; } // }}} +function includeonly_pattern3() // {{{ +{ + return "/basename\s*\(\s*\\\$_SERVER\s*\[\s*[\"']SCRIPT_NAME[\"']\s*\]\s*\)\s*==\s*basename\s*\(\s*__FILE__\s*\)\s*\)/"; +} // }}} + + function includeonly_pattern2() // {{{ { - return "/\\\$access\s*->\s*check_script\s*\\(\s*\\\$_SERVER\s*\\[\s*[\"']SCRIPT_NAME[\"']\s*\\]\s*,\s*basename\s*\\(\s*__FILE__\s*\\)\s*\\)/"; + return "/\\\$access\s*->\s*check_script\s*\(\s*\\\$_SERVER\s*\[\s*[\"']SCRIPT_NAME[\"']\s*\]\s*,\s*basename\s*\(\s*__FILE__\s*\)\s*\)/s"; + //return "/\\\$access\s*\->\s*check_script\s*\(\s*\\\$_SERVER\s*\[\s*[\"']SCRIPT_NAME[\"']\s*\]\s*,\s*basename\s*\(\s*__FILE__\s*\)\s*\)/"; } // }}} function noweb_pattern() // {{{ @@ -207,6 +214,7 @@ function perform_permission_check( &$file ) // {{{ { $index = 0; + $permission_pattern = permission_pattern( $index ); preg_match_all( $permission_pattern, get_content( $file['path'] ), $parts ); @@ -217,19 +225,25 @@ function perform_includeonly_check( &$file ) // {{{ { + $index = 0; $pattern = includeonly_pattern($index); preg_match_all( $pattern, get_content($file['path']), $parts ); - $pattern = includeonly_pattern2($index); + $pattern = includeonly_pattern2($index); - preg_match_all( $pattern, get_content($file['path']), $parts2 ); + preg_match_all( $pattern, get_content($file['path']), $parts2 ); - $file['includeonly'] = count( $parts[0] ) > 0 || count( $parts2[0] ) > 0; + $pattern = includeonly_pattern3($index); + + preg_match_all( $pattern, get_content($file['path']), $parts3 ); + + $file['includeonly'] = count( $parts[0] ) > 0 || count( $parts2[0] ) > 0 || count( $parts3[0] ) > 0; } // }}} function perform_noweb_check( &$file ) // {{{ { + $index = 0; $pattern = noweb_pattern($index); preg_match_all( $pattern, get_content($file['path']), $parts ); @@ -239,6 +253,8 @@ function perform_tikisetup_check( &$file ) // {{{ { + $index = 0; + $pattern = tikisetup_pattern($index); preg_match_all( $pattern, get_content($file['path']), $parts ); @@ -336,7 +352,7 @@ ) ) ): ?> <tr> <td><a href="<?php echo htmlentities( substr( $file['path'], 2 ) ) ?>"><?php echo htmlentities( $file['path'] ) ?></a></td> - <td><?php if( $file['includeonly'] ) echo 'X' ?></td> + <td><?php if( isset($file['includeonly']) && $file['includeonly'] ) echo 'X' ?></td> <td><?php if( $file['noweb'] ) echo 'X' ?></td> <td><?php if( $file['tikisetup'] ) echo 'X' ?></td> <td><?php if( $file['unsafeextract'] ) echo 'X' ?></td> Modified: branches/3.0/modules/mod-semantic_links.php =================================================================== --- branches/3.0/modules/mod-semantic_links.php 2009-03-01 23:01:45 UTC (rev 17042) +++ branches/3.0/modules/mod-semantic_links.php 2009-03-01 23:04:54 UTC (rev 17043) @@ -1,5 +1,11 @@ <?php +//this script may only be included - so its better to die if called directly. +if ( basename($_SERVER['SCRIPT_NAME']) == basename(__FILE__) ) { + header("location: index.php"); + exit; +} + ini_set( 'display_errors', 'on' ); error_reporting(E_ALL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Jy...@us...> - 2009-03-01 23:08:41
|
Revision: 17044 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17044&view=rev Author: Jyhem Date: 2009-03-01 23:08:37 +0000 (Sun, 01 Mar 2009) Log Message: ----------- [SEC] Added security checks Modified Paths: -------------- branches/3.0/setup_fckeditor.php branches/3.0/tiki-admin_bar.php branches/3.0/tiki-admin_features.php branches/3.0/tiki-admin_include_webservices.php branches/3.0/tiki-articles_rss.php branches/3.0/tiki-feature-load-postprocessor.php branches/3.0/tiki-magic.php Modified: branches/3.0/setup_fckeditor.php =================================================================== --- branches/3.0/setup_fckeditor.php 2009-03-01 23:04:54 UTC (rev 17043) +++ branches/3.0/setup_fckeditor.php 2009-03-01 23:08:37 UTC (rev 17044) @@ -6,6 +6,12 @@ $force_no_compression = true; include('tiki-setup.php'); +if ($prefs['feature_wysiwyg'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_wysiwyg"); + $smarty->display("error.tpl"); + die; +} + $fckstyle = 'styles/'.$prefs['style']; if ( $tikidomain and is_file('styles/'.$tikidomain.'/'.$prefs['style']) ) { $fckstyle = 'styles/'.$tikidomain.'/'.$prefs['style']; Modified: branches/3.0/tiki-admin_bar.php =================================================================== --- branches/3.0/tiki-admin_bar.php 2009-03-01 23:04:54 UTC (rev 17043) +++ branches/3.0/tiki-admin_bar.php 2009-03-01 23:08:37 UTC (rev 17044) @@ -1,6 +1,12 @@ <?php include_once ('lib/admin/magiclib.php'); +if ($prefs['feature_magic'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_magic"); + $smarty->display("error.tpl"); + die; +} + $headerlib->add_cssfile('css/spanky.css'); $feature = $smarty->get_template_vars('feature'); Modified: branches/3.0/tiki-admin_features.php =================================================================== --- branches/3.0/tiki-admin_features.php 2009-03-01 23:04:54 UTC (rev 17043) +++ branches/3.0/tiki-admin_features.php 2009-03-01 23:08:37 UTC (rev 17044) @@ -1,6 +1,12 @@ <?php include_once ('lib/admin/magiclib.php'); +if ($prefs['feature_magic'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_magic"); + $smarty->display("error.tpl"); + die; +} + $feature = $smarty->get_template_vars('feature'); $features = $magiclib->get_child_features($feature['feature_id'], 'feature'); Modified: branches/3.0/tiki-admin_include_webservices.php =================================================================== --- branches/3.0/tiki-admin_include_webservices.php 2009-03-01 23:04:54 UTC (rev 17043) +++ branches/3.0/tiki-admin_include_webservices.php 2009-03-01 23:08:37 UTC (rev 17044) @@ -4,6 +4,12 @@ require_once 'lib/ointegratelib.php'; require_once 'lib/webservicelib.php'; +//this script may only be included - so its better to die if called directly. +if ( basename($_SERVER['SCRIPT_NAME']) == basename(__FILE__) ) { + header("Location: index.php"); + exit; +} + if( isset( $_REQUEST['name'] ) && $webservice = Tiki_Webservice::getService( $_REQUEST['name'] ) ) { if( isset( $_REQUEST['delete'] ) && empty( $_REQUEST['delete'] ) ) { Modified: branches/3.0/tiki-articles_rss.php =================================================================== --- branches/3.0/tiki-articles_rss.php 2009-03-01 23:04:54 UTC (rev 17043) +++ branches/3.0/tiki-articles_rss.php 2009-03-01 23:08:37 UTC (rev 17044) @@ -9,6 +9,12 @@ require_once ('lib/tikilib.php'); require_once ('lib/rss/rsslib.php'); +if ($prefs['feature_articles'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_articles"); + $smarty->display("error.tpl"); + die; +} + if ($prefs['rss_articles'] != 'y') { $errmsg=tra("rss feed disabled"); require_once ('tiki-rss_error.php'); Modified: branches/3.0/tiki-feature-load-postprocessor.php =================================================================== --- branches/3.0/tiki-feature-load-postprocessor.php 2009-03-01 23:04:54 UTC (rev 17043) +++ branches/3.0/tiki-feature-load-postprocessor.php 2009-03-01 23:08:37 UTC (rev 17044) @@ -2,6 +2,12 @@ require_once ('tiki-setup.php'); include_once ('lib/admin/magiclib.php'); +if ($prefs['feature_magic'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_magic"); + $smarty->display("error.tpl"); + die; +} + if ($tiki_p_admin != 'y') { $smarty->assign('errortype', 401); $smarty->assign('msg', tra("You do not have permission to use this feature")); Modified: branches/3.0/tiki-magic.php =================================================================== --- branches/3.0/tiki-magic.php 2009-03-01 23:04:54 UTC (rev 17043) +++ branches/3.0/tiki-magic.php 2009-03-01 23:08:37 UTC (rev 17044) @@ -5,6 +5,13 @@ $featurePage = explode('/', $featureChain); $featureId = $featurePage[count($featurePage) - 1]; + +if ($prefs['feature_magic'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_magic"); + $smarty->display("error.tpl"); + die; +} + $feature = $magiclib->get_feature($featureId); $smarty->assign('feature', $feature); $smarty->assign('title', $feature['feature_name']); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Jy...@us...> - 2009-03-01 23:24:28
|
Revision: 17046 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17046&view=rev Author: Jyhem Date: 2009-03-01 23:24:26 +0000 (Sun, 01 Mar 2009) Log Message: ----------- [SEC] Added even more security checks Modified Paths: -------------- branches/3.0/tiki-blogs_rss.php branches/3.0/tiki-file_galleries_rss.php branches/3.0/tiki-forums_rss.php branches/3.0/tiki-image_galleries_rss.php branches/3.0/tiki-map_rss.php branches/3.0/tiki-wiki_rss.php Modified: branches/3.0/tiki-blogs_rss.php =================================================================== --- branches/3.0/tiki-blogs_rss.php 2009-03-01 23:22:49 UTC (rev 17045) +++ branches/3.0/tiki-blogs_rss.php 2009-03-01 23:24:26 UTC (rev 17046) @@ -10,6 +10,12 @@ require_once ('lib/blogs/bloglib.php'); require_once ('lib/rss/rsslib.php'); +if ($prefs['feature_blogs'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_blogs"); + $smarty->display("error.tpl"); + die; +} + if ($prefs['rss_blogs'] != 'y') { $errmsg=tra("rss feed disabled"); require_once ('tiki-rss_error.php'); Modified: branches/3.0/tiki-file_galleries_rss.php =================================================================== --- branches/3.0/tiki-file_galleries_rss.php 2009-03-01 23:22:49 UTC (rev 17045) +++ branches/3.0/tiki-file_galleries_rss.php 2009-03-01 23:24:26 UTC (rev 17046) @@ -9,6 +9,12 @@ require_once ('lib/tikilib.php'); require_once ('lib/rss/rsslib.php'); +if ($prefs['feature_file_galleries'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_file_galleries"); + $smarty->display("error.tpl"); + die; +} + if ($prefs['rss_file_galleries'] != 'y') { $errmsg=tra("rss feed disabled"); require_once ('tiki-rss_error.php'); Modified: branches/3.0/tiki-forums_rss.php =================================================================== --- branches/3.0/tiki-forums_rss.php 2009-03-01 23:22:49 UTC (rev 17045) +++ branches/3.0/tiki-forums_rss.php 2009-03-01 23:24:26 UTC (rev 17046) @@ -9,6 +9,12 @@ require_once ('lib/tikilib.php'); require_once ('lib/rss/rsslib.php'); +if ($prefs['feature_forums'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_forums"); + $smarty->display("error.tpl"); + die; +} + if ($prefs['rss_forums'] != 'y') { $errmsg=tra("rss feed disabled"); require_once ('tiki-rss_error.php'); Modified: branches/3.0/tiki-image_galleries_rss.php =================================================================== --- branches/3.0/tiki-image_galleries_rss.php 2009-03-01 23:22:49 UTC (rev 17045) +++ branches/3.0/tiki-image_galleries_rss.php 2009-03-01 23:24:26 UTC (rev 17046) @@ -10,6 +10,12 @@ require_once ('lib/imagegals/imagegallib.php'); require_once ('lib/rss/rsslib.php'); +if ($prefs['feature_galleries'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_galleries"); + $smarty->display("error.tpl"); + die; +} + if ($prefs['rss_image_galleries'] != 'y') { $errmsg=tra("rss feed disabled"); require_once ('tiki-rss_error.php'); Modified: branches/3.0/tiki-map_rss.php =================================================================== --- branches/3.0/tiki-map_rss.php 2009-03-01 23:22:49 UTC (rev 17045) +++ branches/3.0/tiki-map_rss.php 2009-03-01 23:24:26 UTC (rev 17046) @@ -10,6 +10,12 @@ require_once ('lib/tikilib.php'); require_once ('lib/rss/rsslib.php'); +if ($prefs['feature_maps'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_maps"); + $smarty->display("error.tpl"); + die; +} + if ($prefs['rss_mapfiles'] != 'y') { $errmsg=tra("rss feed disabled"); require_once ('tiki-rss_error.php'); Modified: branches/3.0/tiki-wiki_rss.php =================================================================== --- branches/3.0/tiki-wiki_rss.php 2009-03-01 23:22:49 UTC (rev 17045) +++ branches/3.0/tiki-wiki_rss.php 2009-03-01 23:24:26 UTC (rev 17046) @@ -10,6 +10,12 @@ require_once ('lib/wiki/histlib.php'); require_once ('lib/rss/rsslib.php'); +if ($prefs['feature_wiki'] != 'y') { + $smarty->assign('msg', tra("This feature is disabled").": feature_wiki"); + $smarty->display("error.tpl"); + die; +} + if ($prefs['rss_wiki'] != 'y') { $errmsg=tra("rss feed disabled"); require_once ('tiki-rss_error.php'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-02 00:53:03
|
Revision: 17053 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17053&view=rev Author: luciash Date: 2009-03-02 00:53:01 +0000 (Mon, 02 Mar 2009) Log Message: ----------- [FIX] when checking for new version don't display preference note but information instead Modified Paths: -------------- branches/3.0/templates/tiki-admin.tpl branches/3.0/tiki-admin.php Modified: branches/3.0/templates/tiki-admin.tpl =================================================================== --- branches/3.0/templates/tiki-admin.tpl 2009-03-02 00:20:57 UTC (rev 17052) +++ branches/3.0/templates/tiki-admin.tpl 2009-03-02 00:53:01 UTC (rev 17053) @@ -41,11 +41,13 @@ {icon _id=delete alt="{tr}disabled{/tr}" style="vertical-align: middle"} {elseif $tikifeedback[n].st eq 1} {icon _id=accept alt="{tr}enabled{/tr}" style="vertical-align: middle"} + {elseif $tikifeedback[n].st eq 2} + {icon _id=accept alt="{tr}changed{/tr}" style="vertical-align: middle"} {else} - {icon _id=accept alt="{tr}changed{/tr}" style="vertical-align: middle"} + {icon _id=information alt="{tr}information{/tr}" style="vertical-align: middle"} {/if} - {tr}preference{/tr} <strong>{tr}{$tikifeedback[n].mes|stringfix}{/tr}</strong><br /> - (<em>{tr}preference name:{/tr}</em> {$tikifeedback[n].name}) + {if $tikifeedback[n].st ne 3}{tr}preference{/tr} {/if}<strong>{tr}{$tikifeedback[n].mes|stringfix}{/tr}</strong><br /> + {if $tikifeedback[n].st ne 3}(<em>{tr}preference name:{/tr}</em> {$tikifeedback[n].name}){/if} </p> </li> {/section} Modified: branches/3.0/tiki-admin.php =================================================================== --- branches/3.0/tiki-admin.php 2009-03-02 00:20:57 UTC (rev 17052) +++ branches/3.0/tiki-admin.php 2009-03-02 00:53:01 UTC (rev 17053) @@ -325,13 +325,13 @@ $prefs['tiki_needs_upgrade'] = 'y'; } else { $prefs['tiki_needs_upgrade'] = 'n'; - $tikifeedback[] = array('num'=>1,'mes'=>sprintf(tra("Current version is up to date : <b>%s</b>"), $TWV->version)); + $tikifeedback[] = array('num'=>1,'mes'=>sprintf(tra("Current version is up to date : <b>%s</b>"), $TWV->version),'st'=>3); } $smarty->assign('tiki_needs_upgrade', $prefs['tiki_needs_upgrade']); // See if a major release is available. if ($upgrades[1]) { - $tikifeedback[] = array('num'=>1,'mes'=>sprintf(tra("A new %s major release branch is available."), $TWV->branch)); + $tikifeedback[] = array('num'=>1,'mes'=>sprintf(tra("A new %s major release branch is available."), $TWV->branch),'st'=>3); } // If the versioning feature has been enabled, then store the current @@ -363,7 +363,7 @@ $tikilib->set_preference('tiki_release', $TWV->release); $smarty->assign('tiki_release', $TWV->release); if ($upgrades[1]) { - $tikifeedback[] = array('num'=>1,'mes'=>sprintf(tra("A new %s major release branch is available."), $TWV->branch)); + $tikifeedback[] = array('num'=>1,'mes'=>sprintf(tra("A new %s major release branch is available."), $TWV->branch),'st'=>3); } } else { $prefs['tiki_needs_upgrade'] = 'n'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2009-03-02 18:37:26
|
Revision: 17081 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17081&view=rev Author: nkoth Date: 2009-03-02 18:37:17 +0000 (Mon, 02 Mar 2009) Log Message: ----------- [MOD] Make category filter om admin profiles be a drop-down selector of available cats Modified Paths: -------------- branches/3.0/lib/profilelib/listlib.php branches/3.0/templates/tiki-admin-include-profiles.tpl branches/3.0/tiki-admin_include_profiles.php Modified: branches/3.0/lib/profilelib/listlib.php =================================================================== --- branches/3.0/lib/profilelib/listlib.php 2009-03-02 17:34:09 UTC (rev 17080) +++ branches/3.0/lib/profilelib/listlib.php 2009-03-02 18:37:17 UTC (rev 17081) @@ -59,6 +59,33 @@ return true; } // }}} + function getCategoryList( $source = '' ) // {{{ + { + $category_list = array(); + + $sources = $this->getSources(); + + foreach( $sources as $s ) + { + if( $source && $s['url'] != $source ) + continue; + + if( !$s['lastupdate'] ) + continue; + + $fp = fopen( $this->getCacheLocation( $s['url'] ), 'r' ); + + while( false !== $row = fgetcsv( $fp, 200, "\t" ) ) + { + list( $c, $t, $i ) = $row; + if ($c) $category_list[] = $c; + } + } + + natsort( $category_list ); + return( array_unique( $category_list ) ); + } // }}} + function getList( $source = '', $category = '', $profile = '' ) // {{{ { $list = array(); Modified: branches/3.0/templates/tiki-admin-include-profiles.tpl =================================================================== --- branches/3.0/templates/tiki-admin-include-profiles.tpl 2009-03-02 17:34:09 UTC (rev 17080) +++ branches/3.0/templates/tiki-admin-include-profiles.tpl 2009-03-02 18:37:17 UTC (rev 17081) @@ -228,7 +228,14 @@ </tr> <tr> <td class="form">{tr}Category{/tr}:</td> - <td><input type="text" name="category" value="{$category|escape}"/></td> + <td> + <select name="category"> + <option value="">All</option> + {foreach item=cat from=$category_list} + <option value="{$cat|escape}"{if $cat eq $category} selected="selected"{/if}>{$cat|escape}</option> + {/foreach} + </select> + </td> </tr> <tr> Modified: branches/3.0/tiki-admin_include_profiles.php =================================================================== --- branches/3.0/tiki-admin_include_profiles.php 2009-03-02 17:34:09 UTC (rev 17080) +++ branches/3.0/tiki-admin_include_profiles.php 2009-03-02 18:37:17 UTC (rev 17081) @@ -24,7 +24,7 @@ if( isset($_POST['config']) ) { // {{{ $tikilib->set_preference( 'profile_sources', $_POST['profile_sources'] ); $tikilib->set_preference( 'profile_channels', $_POST['profile_channels'] ); - + header( 'Location: tiki-admin.php?page=profiles' ); exit; } // }}} @@ -129,6 +129,10 @@ $smarty->assign( 'repository', $params['repository'] ); $result = $list->getList( $params['repository'], $params['category'], $params['profile'] ); + + $category_list = $list->getCategoryList( $params['repository'] ); + $smarty->assign( 'category_list', $category_list ); + $smarty->assign( 'result', $result ); } // }}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2009-03-02 20:14:49
|
Revision: 17086 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17086&view=rev Author: jonnybradley Date: 2009-03-02 20:14:21 +0000 (Mon, 02 Mar 2009) Log Message: ----------- [MRG] JQuery branch (manual) merge to branch/3.0 All of it - 2 new dirs in /lib, one new template and 14 mods to existing files Modified Paths: -------------- branches/3.0/lib/setup/prefs.php branches/3.0/lib/smarty_tiki/modifier.userlink.php branches/3.0/lib/tikilib.php branches/3.0/styles/transitions/2.0to3.0.css branches/3.0/templates/header.tpl branches/3.0/templates/header_simple.tpl branches/3.0/templates/modules/mod-quick_edit.tpl branches/3.0/templates/modules/mod-shoutjax.tpl branches/3.0/templates/tiki-admin-include-features.tpl branches/3.0/templates/tiki-admin-include-look.tpl branches/3.0/tiki-admin_include_features.php branches/3.0/tiki-admin_include_look.php branches/3.0/tiki-listpages.php Added Paths: ----------- branches/3.0/lib/jquery/ branches/3.0/lib/jquery/cluetip/ branches/3.0/lib/jquery/cluetip/Changelog.txt branches/3.0/lib/jquery/cluetip/images/ branches/3.0/lib/jquery/cluetip/images/arrowdown.gif branches/3.0/lib/jquery/cluetip/images/arrowleft.gif branches/3.0/lib/jquery/cluetip/images/arrowright.gif branches/3.0/lib/jquery/cluetip/images/arrowup.gif branches/3.0/lib/jquery/cluetip/images/bl.gif branches/3.0/lib/jquery/cluetip/images/bl.png branches/3.0/lib/jquery/cluetip/images/br.gif branches/3.0/lib/jquery/cluetip/images/br.png branches/3.0/lib/jquery/cluetip/images/darrowdown.gif branches/3.0/lib/jquery/cluetip/images/darrowleft.gif branches/3.0/lib/jquery/cluetip/images/darrowright.gif branches/3.0/lib/jquery/cluetip/images/darrowup.gif branches/3.0/lib/jquery/cluetip/images/rarrowdown.gif branches/3.0/lib/jquery/cluetip/images/rarrowleft.gif branches/3.0/lib/jquery/cluetip/images/rarrowright.gif branches/3.0/lib/jquery/cluetip/images/rarrowup.gif branches/3.0/lib/jquery/cluetip/images/tl.gif branches/3.0/lib/jquery/cluetip/images/tl.png branches/3.0/lib/jquery/cluetip/images/tr.gif branches/3.0/lib/jquery/cluetip/images/tr.png branches/3.0/lib/jquery/cluetip/jquery-1.2.5.min.js branches/3.0/lib/jquery/cluetip/jquery.cluetip.css branches/3.0/lib/jquery/cluetip/jquery.cluetip.js branches/3.0/lib/jquery/cluetip/jquery.dimensions-1.2.js branches/3.0/lib/jquery/cluetip/jquery.dimensions.js branches/3.0/lib/jquery/cluetip/jquery.hoverIntent.js branches/3.0/lib/jquery/cluetip/wait.gif branches/3.0/lib/jquery/index.php branches/3.0/lib/jquery/jquery-autocomplete/ branches/3.0/lib/jquery/jquery-autocomplete/changelog.txt branches/3.0/lib/jquery/jquery-autocomplete/jquery.autocomplete.css branches/3.0/lib/jquery/jquery-autocomplete/jquery.autocomplete.js branches/3.0/lib/jquery/jquery-autocomplete/jquery.autocomplete.min.js branches/3.0/lib/jquery/jquery-autocomplete/jquery.autocomplete.pack.js branches/3.0/lib/jquery/jquery-autocomplete/lib/ branches/3.0/lib/jquery/jquery-autocomplete/lib/jquery.ajaxQueue.js branches/3.0/lib/jquery/jquery-autocomplete/lib/jquery.bgiframe.min.js branches/3.0/lib/jquery/jquery-autocomplete/lib/thickbox-compressed.js branches/3.0/lib/jquery/jquery-autocomplete/lib/thickbox.css branches/3.0/lib/jquery/jquery-autocomplete/todo branches/3.0/lib/jquery/jquery-tiki-readme.txt branches/3.0/lib/jquery/jquery.js branches/3.0/lib/jquery/jquery.min.js branches/3.0/lib/jquery/jquery.ui/ branches/3.0/lib/jquery/jquery.ui/AUTHORS.txt branches/3.0/lib/jquery/jquery.ui/GPL-LICENSE.txt branches/3.0/lib/jquery/jquery.ui/MIT-LICENSE.txt branches/3.0/lib/jquery/jquery.ui/external/ branches/3.0/lib/jquery/jquery.ui/external/bgiframe/ branches/3.0/lib/jquery/jquery.ui/external/bgiframe/ChangeLog.txt branches/3.0/lib/jquery/jquery.ui/external/bgiframe/META.json branches/3.0/lib/jquery/jquery.ui/external/bgiframe/docs/ branches/3.0/lib/jquery/jquery.ui/external/bgiframe/docs/index.html branches/3.0/lib/jquery/jquery.ui/external/bgiframe/jquery.bgiframe.js branches/3.0/lib/jquery/jquery.ui/external/bgiframe/jquery.bgiframe.min.js branches/3.0/lib/jquery/jquery.ui/external/bgiframe/jquery.bgiframe.pack.js branches/3.0/lib/jquery/jquery.ui/external/bgiframe/test/ branches/3.0/lib/jquery/jquery.ui/external/bgiframe/test/index.html branches/3.0/lib/jquery/jquery.ui/external/cookie/ branches/3.0/lib/jquery/jquery.ui/external/cookie/jquery.cookie.js branches/3.0/lib/jquery/jquery.ui/external/cookie/jquery.cookie.min.js branches/3.0/lib/jquery/jquery.ui/external/cookie/jquery.cookie.pack.js branches/3.0/lib/jquery/jquery.ui/external/cookie/jquery.cookie.zip branches/3.0/lib/jquery/jquery.ui/external/qunit/ branches/3.0/lib/jquery/jquery.ui/external/qunit/testrunner.js branches/3.0/lib/jquery/jquery.ui/external/qunit/testsuite.css branches/3.0/lib/jquery/jquery.ui/external/simulate/ branches/3.0/lib/jquery/jquery.ui/external/simulate/jquery.simulate.js branches/3.0/lib/jquery/jquery.ui/jquery-1.3.1.js branches/3.0/lib/jquery/jquery.ui/themes/ branches/3.0/lib/jquery/jquery.ui/themes/base/ branches/3.0/lib/jquery/jquery.ui/themes/base/images/ branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_glass_75_ffffff_1x400.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_inset-soft_95_fef1ec_1x100.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-icons_222222_256x240.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-icons_2e83ff_256x240.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-icons_454545_256x240.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-icons_888888_256x240.png branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-icons_cd0a0a_256x240.png branches/3.0/lib/jquery/jquery.ui/themes/base/ui.accordion.css branches/3.0/lib/jquery/jquery.ui/themes/base/ui.all.css branches/3.0/lib/jquery/jquery.ui/themes/base/ui.base.css branches/3.0/lib/jquery/jquery.ui/themes/base/ui.core.css branches/3.0/lib/jquery/jquery.ui/themes/base/ui.datepicker.css branches/3.0/lib/jquery/jquery.ui/themes/base/ui.dialog.css branches/3.0/lib/jquery/jquery.ui/themes/base/ui.progressbar.css branches/3.0/lib/jquery/jquery.ui/themes/base/ui.resizable.css branches/3.0/lib/jquery/jquery.ui/themes/base/ui.slider.css branches/3.0/lib/jquery/jquery.ui/themes/base/ui.tabs.css branches/3.0/lib/jquery/jquery.ui/themes/base/ui.theme.css branches/3.0/lib/jquery/jquery.ui/ui/ branches/3.0/lib/jquery/jquery.ui/ui/effects.blind.js branches/3.0/lib/jquery/jquery.ui/ui/effects.bounce.js branches/3.0/lib/jquery/jquery.ui/ui/effects.clip.js branches/3.0/lib/jquery/jquery.ui/ui/effects.core.js branches/3.0/lib/jquery/jquery.ui/ui/effects.drop.js branches/3.0/lib/jquery/jquery.ui/ui/effects.explode.js branches/3.0/lib/jquery/jquery.ui/ui/effects.fold.js branches/3.0/lib/jquery/jquery.ui/ui/effects.highlight.js branches/3.0/lib/jquery/jquery.ui/ui/effects.pulsate.js branches/3.0/lib/jquery/jquery.ui/ui/effects.scale.js branches/3.0/lib/jquery/jquery.ui/ui/effects.shake.js branches/3.0/lib/jquery/jquery.ui/ui/effects.slide.js branches/3.0/lib/jquery/jquery.ui/ui/effects.transfer.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ branches/3.0/lib/jquery/jquery.ui/ui/i18n/jquery.ui.i18n.all.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ar.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-bg.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ca.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-cs.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-da.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-de.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-el.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-eo.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-es.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-fa.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-fi.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-fr.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-he.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-hr.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-hu.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-hy.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-id.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-is.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-it.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ja.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ko.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-lt.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-lv.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ms.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-nl.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-no.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-pl.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-pt-BR.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ro.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ru.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-sk.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-sl.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-sq.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-sv.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-th.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-tr.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-uk.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-zh-CN.js branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-zh-TW.js branches/3.0/lib/jquery/jquery.ui/ui/jquery.ui.all.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.blind.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.bounce.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.clip.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.core.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.drop.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.explode.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.fold.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.highlight.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.pulsate.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.scale.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.shake.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.slide.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.transfer.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/jquery.ui.i18n.all.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ar.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-bg.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ca.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-cs.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-da.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-de.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-el.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-eo.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-es.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-fa.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-fi.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-fr.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-he.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-hr.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-hu.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-hy.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-id.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-is.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-it.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ja.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ko.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-lt.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-lv.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ms.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-nl.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-no.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-pl.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-pt-BR.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ro.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ru.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-sk.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-sl.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-sq.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-sv.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-th.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-tr.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-uk.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-zh-CN.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-zh-TW.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/jquery.ui.all.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.accordion.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.core.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.datepicker.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.dialog.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.draggable.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.droppable.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.progressbar.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.resizable.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.selectable.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.slider.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.sortable.min.js branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.tabs.min.js branches/3.0/lib/jquery/jquery.ui/ui/ui.accordion.js branches/3.0/lib/jquery/jquery.ui/ui/ui.core.js branches/3.0/lib/jquery/jquery.ui/ui/ui.datepicker.js branches/3.0/lib/jquery/jquery.ui/ui/ui.dialog.js branches/3.0/lib/jquery/jquery.ui/ui/ui.draggable.js branches/3.0/lib/jquery/jquery.ui/ui/ui.droppable.js branches/3.0/lib/jquery/jquery.ui/ui/ui.progressbar.js branches/3.0/lib/jquery/jquery.ui/ui/ui.resizable.js branches/3.0/lib/jquery/jquery.ui/ui/ui.selectable.js branches/3.0/lib/jquery/jquery.ui/ui/ui.slider.js branches/3.0/lib/jquery/jquery.ui/ui/ui.sortable.js branches/3.0/lib/jquery/jquery.ui/ui/ui.tabs.js branches/3.0/lib/jquery/jquery.ui/version.txt branches/3.0/lib/jquery/reflection-jquery/ branches/3.0/lib/jquery/reflection-jquery/js/ branches/3.0/lib/jquery/reflection-jquery/js/reflection.js branches/3.0/lib/jquery/reflection-jquery/src/ branches/3.0/lib/jquery/reflection-jquery/src/reflection.js branches/3.0/lib/jquery/superfish/ branches/3.0/lib/jquery/superfish/changelog.txt branches/3.0/lib/jquery/superfish/css/ branches/3.0/lib/jquery/superfish/css/superfish-navbar.css branches/3.0/lib/jquery/superfish/css/superfish-vertical.css branches/3.0/lib/jquery/superfish/css/superfish.css branches/3.0/lib/jquery/superfish/example.html branches/3.0/lib/jquery/superfish/images/ branches/3.0/lib/jquery/superfish/images/arrows-ffffff.png branches/3.0/lib/jquery/superfish/images/shadow.png branches/3.0/lib/jquery/superfish/js/ branches/3.0/lib/jquery/superfish/js/jquery.bgiframe.min.js branches/3.0/lib/jquery/superfish/js/superfish.js branches/3.0/lib/jquery/superfish/js/supersubs.js branches/3.0/lib/jquery_tiki/ branches/3.0/lib/jquery_tiki/index.php branches/3.0/lib/jquery_tiki/tiki-jquery.js branches/3.0/templates/header_jquery.tpl Added: branches/3.0/lib/jquery/cluetip/Changelog.txt =================================================================== --- branches/3.0/lib/jquery/cluetip/Changelog.txt (rev 0) +++ branches/3.0/lib/jquery/cluetip/Changelog.txt 2009-03-02 20:14:21 UTC (rev 17086) @@ -0,0 +1,138 @@ + +== New and Noteworthy == + +== 0.9.8 == + +* fixed problem with metadata plugin compatibility; +* fixed problem with non-iterating nested options by using recursive $.extend +* added optional first argument that allows loading cluetip contents from provided string + +== 0.9.7 == + +* added support for metadata plugin +* patch for problem with outerHeight returning 0 +* fixed problem with title attribute conflict when using custom title +* avoided opera bug for img loading countdown with ajax; this had the effect of not loading cluetip first time it was hovered +* added initial semicolon to avoid problems with file concats + +== 0.9.6 == + +* fixed tip width measurement bug, which affected Safari +* fixed dropShadow not appearing in edge cases. added overflow: hidden; to clueTip title +* added title tag to list of tags to strip before serving up the requested file + +== 0.9.5 == + +* added clickThrough option to allow click to go to page, even if href and tipAttribute are equal. +* added experimental mouse tracking option +* added simple/experimental delayedClose option to allow auto-closing of clueTip after given number of milliseconds. +* added "focus" as an available value for "activation" option. Will show clueTip on focus of a form element, hide on blur. +* added support for bgiframe plugin. When the bgiframe plugin is referenced in the docuement, clueTip will use it (in IE6). +* cleaned up default ajaxProcess option. +* provided public access to all default plugin settings (thanks malsup!) +* fixed bug (reported at http://jquery.com/plugins/node/941) when splitTitle is used and title attribute is empty +* fixed bug where a variable was improperly nested in an if statement +* fixed bug with incorrectly disabling link when no href is present in invoking element +* fixed annoyance (reported at http://plugins.jquery.com/node/1081): default title attributes showing before cluetip when using long interval in hoverIntent. +* fixed bug where hoverIntent's timeout setting wasn't working with mouseoutClose when user moused out of the clueTip +* fixed problem with setting width option to "auto". Now, non-number widths such as 'auto' default to 275px. +* fixed bug with activation by click where it wouldn't show clueTip under certain circumstances + +== 0.9.3 == + +* Fixed "arrows" option so that it now works for all three themes. Changed the way it works, and changed css to work better with it. +* Removed rounded-corners theme's reliance on #cluetip-title for part of the background image. Now, you can hide the title without losing part of the clueTip's background. +* Moved all images for arrows and rounded corners to a separate folder. + +== 0.9.2.2 == + +* added support for any selector expression to be used for grabbing local content. The plugin will just take the first element in the set of matched elements for its content. +* release the cursor setting when clueTip is closed. +* if jQuery 1.2.x is being used, local option uses .clone(true) and appends local element to clueTip (after emptying) so that events within that local content don't lose their binding + +== 0.9.2.1 == + +* added .clue-bottom-[cluetipClass] and .clue-top-[cluetipClass] when cluetip is positioned below or above the linked element. +* added "fixed" as a possible value for the "positionBy" option. With this, the clueTip will always appear in the same position relative to the linked element. +* added "topOffset" and "leftOffset" options. See documentation for details. + +== 0.9.0 == + +* fixed a couple bugs introduced by the new 'bottomTop' value for 'positionBy' in 0.8.7. +* fixed the stray, content-less clueTip that was being left visible in certain situations. + +== 0.8.7 == + +* added 'bottomTop' as an available value for the "positionBy" option. +* added ability to set hoverIntent options through cluetip's hoverIntent options +* added height option that allows setting a static height for the clueTip and puts in a vertical scrollbar if the contents don't fit. That situation of course is not very usable unless the clueTip is sticky as well, so the user can actually scroll it. + +== 0.8.6 == + +* changed fx.open default to 'show' and fx.openSpeed default to '' (empty string) +* ajaxed contents now wait until all images are loaded before being shown. Code generously provided by Torben Schreiter. + +== 0.8.5 == + +* changed waitImage option to Boolean. Now the wait image comes from the stylesheet, jquery.cluetip.css, as a background image. This is all in an attempt to avoid the annoying scroll jumping (see not for 0.8.4). +* reverted "changed the way the waitImage is hidden" from 0.8.4. + +== 0.8.4 == + +* changed the way the waitImage is hidden, because of some bizarre scroll jumping that occurred on a couple sites. +* added $.cluetip.setup() to allow for custom insertion type. appendTo is the default; other types are prependTo, insertBefore, and insertAfter. Also insertionElement allows user to determine where in the DOM the clueTip will be loaded + +== 0.8.3 == + +* added ajaxCache option, which caches the results of the ajax request to avoid unnecessary hits to the server (caching was already being done, but now it's optional). When set to false, the script will make an ajax request every time the clueTip is shown, which allows for dynamic content to be loaded. +* added mouseOutClose option. Now, when you set both the sticky and the mouseOutClose option to true, the clueTip will hide when you either click the close link or mouse out of the clueTip altogether. +* added behavior for ajaxSettings.error and ajaxSettings.complete. Now, regardless of success or error, the clueTip will be shown and the waitImage will be hidden. If there is an error, the contents of the clueTip will read: "sorry, contents could not be loaded." + +== 0.8.2 == + +* improved positioning of too-wide cluetips. +* don't show the loading image if waitImage is set to empty string or false +* changed y-positioning of loading image to be based on mouse position, as I think it will fix the scroll-jump bug as reported by to.rben on http://www.learningjquery.com/2007/07/cluetip-plugin-beta-2 + +== 0.8.1 == + +* for "closePosition" option, added ability to set it to "title" so that the close link can go in the clueTip's heading area. + +== 0.8 == + +Additional features/enhancements +* changed <span id="cluetip-close"> to <div id="cluetip-close"> because I was (stupidly) setting its "display" property to "block" anyway. So, also removed .css('display','block) +* added fx options: open, openSpeed, close, closeSpeed. open and close can take one of the jQuery core effects (fadeIn/fadeOut, show/hide, slideDown/slideUp); openSpeed and close Speed take, well, a speed. +* added positionBy option. Default is "auto". When set to "mouse" will position the clueTip by the mouse position, not the element position +* added cluezIndex option. Default is 97. Sets the z-index property of the clueTip +* added cluetipClass option. Default is 'default'. This option adds a class to the #cluetip div for applying colors, backgrounds, etc. +* added cursor option. Default is 'help'. This cursor type is used, when the tip attribute and the href are the same. +* added dropShadowSteps option. Default is 6. This determines how big the drop shadow is (i.e. how many drop-shadow divs are created for the clueTip). Each "step" correlates to 1 pixel of drop shadow. +* added brand-new rounded-corners theme. To use this, create a clueTip with at least these options .cluetip() {cluetipClass: 'rounded', dropShadow: false}) +* enhanced positioning logic. If there isn't enough horizontal space for the clueTip to appear, either to the left or to the right, without intruding on the mouse position (and thus causing the clueTip to flicker on and off repeatedly), then its top is positioned 10 pixels below the mouse. However, if the clueTip would get partially cut off at the bottom of the viewable area, and if there is enough room for it between the top of the viewable area and the mouse position, then its bottom will be positioned 10 pixels above the mouse. + +Bug fixes + +* dealt with AJAX race condition, reported by to.rben: http://www.learningjquery.com/2007/07/cluetip-plugin-beta-2#comment-8786 + +* fixed problem with activation by click. Before, if a user clicked to show the clueTip, and then closed the clueTip by some other means than clicking the same link element, the user had to click twice to show the clueTip the next time. + +* general cleaning up and re-ordering of code + +== 0.7 == + +Additional features/enhancements + +* the waitImage feature/option is now implemented for ajax-loaded clueTips +* the drop-shadow effect is now created with dynamically generated div elements with decreasing level of opacity. This allows for cross-browser compatibility without having to deal with png hacks. +* added a dropShadow option that adds a drop shadow to the clueTip. Default is true +* the clueTip heading (<h3>) now comes before <div id="cluetip-inner">, not inside it. This should make it much easier to apply sane CSS. +* added alternate theme based on Cody Lindley’s jTip, and created demo files to show it (alt-demo.html, et. al.) +* added an arrows option that sets the vertical background position to line up an image with the hovered element. Default is false. This option should be set to true for the alternate jTip theme. +* <div id="cluetip"> now gets class="clue-left" if positioned to the left of the hovered element and class="clue-right" if positioned to the right. Useful for styling the clueTip differently based on where it displays, as is done in the jTip theme. + +Bug fixes + +* changed $(document).width() to the more appropriate $(window).width() for positioning the clueTip’s x coordinate. +* changed the clueTip’s height calculation to occur after truncate and tipTitle options are considered so that positioning will be more accurate and drop shadows will be applied correctly. +* fixed positioning glitch when applying clueTip to an area element; now it positions the clueTip relative to the mouse position. Added: branches/3.0/lib/jquery/cluetip/images/arrowdown.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/arrowdown.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/arrowleft.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/arrowleft.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/arrowright.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/arrowright.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/arrowup.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/arrowup.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/bl.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/bl.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/bl.png =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/bl.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/br.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/br.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/br.png =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/br.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/darrowdown.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/darrowdown.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/darrowleft.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/darrowleft.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/darrowright.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/darrowright.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/darrowup.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/darrowup.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/rarrowdown.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/rarrowdown.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/rarrowleft.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/rarrowleft.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/rarrowright.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/rarrowright.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/rarrowup.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/rarrowup.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/tl.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/tl.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/tl.png =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/tl.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/tr.gif =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/tr.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/images/tr.png =================================================================== (Binary files differ) Property changes on: branches/3.0/lib/jquery/cluetip/images/tr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/3.0/lib/jquery/cluetip/jquery-1.2.5.min.js =================================================================== --- branches/3.0/lib/jquery/cluetip/jquery-1.2.5.min.js (rev 0) +++ branches/3.0/lib/jquery/cluetip/jquery-1.2.5.min.js 2009-03-02 20:14:21 UTC (rev 17086) @@ -0,0 +1,32 @@ +/* + * jQuery 1.2.5 - New Wave Javascript + * + * Copyright (c) 2008 John Resig (jquery.com) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * $Date: 2008-05-20 23:14:54 -0400 (Tue, 20 May 2008) $ + * $Rev: 5651 $ + */ +(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else +return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.5",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else +return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else +selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else +return(this[0].value||"").replace(/\r/g,"");}return undefined;}return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else +this.value=value;});},html:function(value){return value==undefined?(this.length?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else +return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script")){scripts=scripts.add(elem);}else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else +jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&©&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else +script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else +for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else +for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else +jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else +ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(notxml&&!special&&name in elem){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&¬xml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);if(msie&&special&¬xml)return elem.getAttribute(name,2);return elem.getAttribute(name);}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else +while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else +while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[r... [truncated message content] |
From: Sylvie G. <sgr...@gm...> - 2009-03-08 20:59:05
|
Hi Jonny About the comment // *** ERROR *** feature_shadowbox enabled but without feature_mootools or feature_jquery // Dummy function follows to prevent JavaScript errors If the comment is true, this is not working very well If I have shadowbox but no mootools and no jquery I have syntax error line 103 in header.tpl on the line }); If one of them is on, I have no error Sylvie On Mon, 2009-03-02 at 20:14 +0000, jon...@us... wrote: > Revision: 17086 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17086&view=rev > Author: jonnybradley > Date: 2009-03-02 20:14:21 +0000 (Mon, 02 Mar 2009) > > Log Message: > ----------- > [MRG] JQuery branch (manual) merge to branch/3.0 > All of it - 2 new dirs in /lib, one new template and 14 mods to existing files > > Modified Paths: > -------------- > branches/3.0/lib/setup/prefs.php > branches/3.0/lib/smarty_tiki/modifier.userlink.php > branches/3.0/lib/tikilib.php > branches/3.0/styles/transitions/2.0to3.0.css > branches/3.0/templates/header.tpl > branches/3.0/templates/header_simple.tpl > branches/3.0/templates/modules/mod-quick_edit.tpl > branches/3.0/templates/modules/mod-shoutjax.tpl > branches/3.0/templates/tiki-admin-include-features.tpl > branches/3.0/templates/tiki-admin-include-look.tpl > branches/3.0/tiki-admin_include_features.php > branches/3.0/tiki-admin_include_look.php > branches/3.0/tiki-listpages.php > > Added Paths: > ----------- > branches/3.0/lib/jquery/ > branches/3.0/lib/jquery/cluetip/ > branches/3.0/lib/jquery/cluetip/Changelog.txt > branches/3.0/lib/jquery/cluetip/images/ > branches/3.0/lib/jquery/cluetip/images/arrowdown.gif > branches/3.0/lib/jquery/cluetip/images/arrowleft.gif > branches/3.0/lib/jquery/cluetip/images/arrowright.gif > branches/3.0/lib/jquery/cluetip/images/arrowup.gif > branches/3.0/lib/jquery/cluetip/images/bl.gif > branches/3.0/lib/jquery/cluetip/images/bl.png > branches/3.0/lib/jquery/cluetip/images/br.gif > branches/3.0/lib/jquery/cluetip/images/br.png > branches/3.0/lib/jquery/cluetip/images/darrowdown.gif > branches/3.0/lib/jquery/cluetip/images/darrowleft.gif > branches/3.0/lib/jquery/cluetip/images/darrowright.gif > branches/3.0/lib/jquery/cluetip/images/darrowup.gif > branches/3.0/lib/jquery/cluetip/images/rarrowdown.gif > branches/3.0/lib/jquery/cluetip/images/rarrowleft.gif > branches/3.0/lib/jquery/cluetip/images/rarrowright.gif > branches/3.0/lib/jquery/cluetip/images/rarrowup.gif > branches/3.0/lib/jquery/cluetip/images/tl.gif > branches/3.0/lib/jquery/cluetip/images/tl.png > branches/3.0/lib/jquery/cluetip/images/tr.gif > branches/3.0/lib/jquery/cluetip/images/tr.png > branches/3.0/lib/jquery/cluetip/jquery-1.2.5.min.js > branches/3.0/lib/jquery/cluetip/jquery.cluetip.css > branches/3.0/lib/jquery/cluetip/jquery.cluetip.js > branches/3.0/lib/jquery/cluetip/jquery.dimensions-1.2.js > branches/3.0/lib/jquery/cluetip/jquery.dimensions.js > branches/3.0/lib/jquery/cluetip/jquery.hoverIntent.js > branches/3.0/lib/jquery/cluetip/wait.gif > branches/3.0/lib/jquery/index.php > branches/3.0/lib/jquery/jquery-autocomplete/ > branches/3.0/lib/jquery/jquery-autocomplete/changelog.txt > branches/3.0/lib/jquery/jquery-autocomplete/jquery.autocomplete.css > branches/3.0/lib/jquery/jquery-autocomplete/jquery.autocomplete.js > branches/3.0/lib/jquery/jquery-autocomplete/jquery.autocomplete.min.js > branches/3.0/lib/jquery/jquery-autocomplete/jquery.autocomplete.pack.js > branches/3.0/lib/jquery/jquery-autocomplete/lib/ > branches/3.0/lib/jquery/jquery-autocomplete/lib/jquery.ajaxQueue.js > branches/3.0/lib/jquery/jquery-autocomplete/lib/jquery.bgiframe.min.js > branches/3.0/lib/jquery/jquery-autocomplete/lib/thickbox-compressed.js > branches/3.0/lib/jquery/jquery-autocomplete/lib/thickbox.css > branches/3.0/lib/jquery/jquery-autocomplete/todo > branches/3.0/lib/jquery/jquery-tiki-readme.txt > branches/3.0/lib/jquery/jquery.js > branches/3.0/lib/jquery/jquery.min.js > branches/3.0/lib/jquery/jquery.ui/ > branches/3.0/lib/jquery/jquery.ui/AUTHORS.txt > branches/3.0/lib/jquery/jquery.ui/GPL-LICENSE.txt > branches/3.0/lib/jquery/jquery.ui/MIT-LICENSE.txt > branches/3.0/lib/jquery/jquery.ui/external/ > branches/3.0/lib/jquery/jquery.ui/external/bgiframe/ > branches/3.0/lib/jquery/jquery.ui/external/bgiframe/ChangeLog.txt > branches/3.0/lib/jquery/jquery.ui/external/bgiframe/META.json > branches/3.0/lib/jquery/jquery.ui/external/bgiframe/docs/ > branches/3.0/lib/jquery/jquery.ui/external/bgiframe/docs/index.html > branches/3.0/lib/jquery/jquery.ui/external/bgiframe/jquery.bgiframe.js > branches/3.0/lib/jquery/jquery.ui/external/bgiframe/jquery.bgiframe.min.js > branches/3.0/lib/jquery/jquery.ui/external/bgiframe/jquery.bgiframe.pack.js > branches/3.0/lib/jquery/jquery.ui/external/bgiframe/test/ > branches/3.0/lib/jquery/jquery.ui/external/bgiframe/test/index.html > branches/3.0/lib/jquery/jquery.ui/external/cookie/ > branches/3.0/lib/jquery/jquery.ui/external/cookie/jquery.cookie.js > branches/3.0/lib/jquery/jquery.ui/external/cookie/jquery.cookie.min.js > branches/3.0/lib/jquery/jquery.ui/external/cookie/jquery.cookie.pack.js > branches/3.0/lib/jquery/jquery.ui/external/cookie/jquery.cookie.zip > branches/3.0/lib/jquery/jquery.ui/external/qunit/ > branches/3.0/lib/jquery/jquery.ui/external/qunit/testrunner.js > branches/3.0/lib/jquery/jquery.ui/external/qunit/testsuite.css > branches/3.0/lib/jquery/jquery.ui/external/simulate/ > branches/3.0/lib/jquery/jquery.ui/external/simulate/jquery.simulate.js > branches/3.0/lib/jquery/jquery.ui/jquery-1.3.1.js > branches/3.0/lib/jquery/jquery.ui/themes/ > branches/3.0/lib/jquery/jquery.ui/themes/base/ > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_glass_75_ffffff_1x400.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-bg_inset-soft_95_fef1ec_1x100.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-icons_222222_256x240.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-icons_2e83ff_256x240.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-icons_454545_256x240.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-icons_888888_256x240.png > branches/3.0/lib/jquery/jquery.ui/themes/base/images/ui-icons_cd0a0a_256x240.png > branches/3.0/lib/jquery/jquery.ui/themes/base/ui.accordion.css > branches/3.0/lib/jquery/jquery.ui/themes/base/ui.all.css > branches/3.0/lib/jquery/jquery.ui/themes/base/ui.base.css > branches/3.0/lib/jquery/jquery.ui/themes/base/ui.core.css > branches/3.0/lib/jquery/jquery.ui/themes/base/ui.datepicker.css > branches/3.0/lib/jquery/jquery.ui/themes/base/ui.dialog.css > branches/3.0/lib/jquery/jquery.ui/themes/base/ui.progressbar.css > branches/3.0/lib/jquery/jquery.ui/themes/base/ui.resizable.css > branches/3.0/lib/jquery/jquery.ui/themes/base/ui.slider.css > branches/3.0/lib/jquery/jquery.ui/themes/base/ui.tabs.css > branches/3.0/lib/jquery/jquery.ui/themes/base/ui.theme.css > branches/3.0/lib/jquery/jquery.ui/ui/ > branches/3.0/lib/jquery/jquery.ui/ui/effects.blind.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.bounce.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.clip.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.core.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.drop.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.explode.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.fold.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.highlight.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.pulsate.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.scale.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.shake.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.slide.js > branches/3.0/lib/jquery/jquery.ui/ui/effects.transfer.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ > branches/3.0/lib/jquery/jquery.ui/ui/i18n/jquery.ui.i18n.all.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ar.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-bg.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ca.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-cs.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-da.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-de.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-el.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-eo.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-es.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-fa.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-fi.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-fr.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-he.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-hr.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-hu.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-hy.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-id.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-is.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-it.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ja.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ko.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-lt.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-lv.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ms.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-nl.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-no.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-pl.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-pt-BR.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ro.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-ru.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-sk.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-sl.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-sq.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-sv.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-th.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-tr.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-uk.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-zh-CN.js > branches/3.0/lib/jquery/jquery.ui/ui/i18n/ui.datepicker-zh-TW.js > branches/3.0/lib/jquery/jquery.ui/ui/jquery.ui.all.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.blind.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.bounce.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.clip.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.core.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.drop.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.explode.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.fold.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.highlight.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.pulsate.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.scale.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.shake.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.slide.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/effects.transfer.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/jquery.ui.i18n.all.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ar.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-bg.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ca.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-cs.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-da.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-de.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-el.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-eo.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-es.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-fa.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-fi.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-fr.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-he.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-hr.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-hu.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-hy.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-id.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-is.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-it.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ja.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ko.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-lt.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-lv.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ms.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-nl.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-no.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-pl.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-pt-BR.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ro.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-ru.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-sk.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-sl.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-sq.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-sv.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-th.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-tr.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-uk.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-zh-CN.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/i18n/ui.datepicker-zh-TW.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/jquery.ui.all.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.accordion.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.core.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.datepicker.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.dialog.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.draggable.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.droppable.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.progressbar.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.resizable.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.selectable.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.slider.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.sortable.min.js > branches/3.0/lib/jquery/jquery.ui/ui/minified/ui.tabs.min.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.accordion.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.core.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.datepicker.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.dialog.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.draggable.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.droppable.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.progressbar.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.resizable.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.selectable.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.slider.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.sortable.js > branches/3.0/lib/jquery/jquery.ui/ui/ui.tabs.js > branches/3.0/lib/jquery/jquery.ui/version.txt > branches/3.0/lib/jquery/reflection-jquery/ > branches/3.0/lib/jquery/reflection-jquery/js/ > branches/3.0/lib/jquery/reflection-jquery/js/reflection.js > branches/3.0/lib/jquery/reflection-jquery/src/ > branches/3.0/lib/jquery/reflection-jquery/src/reflection.js > branches/3.0/lib/jquery/superfish/ > branches/3.0/lib/jquery/superfish/changelog.txt > branches/3.0/lib/jquery/superfish/css/ > branches/3.0/lib/jquery/superfish/css/superfish-navbar.css > branches/3.0/lib/jquery/superfish/css/superfish-vertical.css > branches/3.0/lib/jquery/superfish/css/superfish.css > branches/3.0/lib/jquery/superfish/example.html > branches/3.0/lib/jquery/superfish/images/ > branches/3.0/lib/jquery/superfish/images/arrows-ffffff.png > branches/3.0/lib/jquery/superfish/images/shadow.png > branches/3.0/lib/jquery/superfish/js/ > branches/3.0/lib/jquery/superfish/js/jquery.bgiframe.min.js > branches/3.0/lib/jquery/superfish/js/superfish.js > branches/3.0/lib/jquery/superfish/js/supersubs.js > branches/3.0/lib/jquery_tiki/ > branches/3.0/lib/jquery_tiki/index.php > branches/3.0/lib/jquery_tiki/tiki-jquery.js > branches/3.0/templates/header_jquery.tpl > > Added: branches/3.0/lib/jquery/cluetip/Changelog.txt > =================================================================== > --- branches/3.0/lib/jquery/cluetip/Changelog.txt (rev 0) > +++ branches/3.0/lib/jquery/cluetip/Changelog.txt 2009-03-02 20:14:21 UTC (rev 17086) > @@ -0,0 +1,138 @@ > + > +== New and Noteworthy == > + > +== 0.9.8 == > + > +* fixed problem with metadata plugin compatibility; > +* fixed problem with non-iterating nested options by using recursive $.extend > +* added optional first argument that allows loading cluetip contents from provided string > + > +== 0.9.7 == > + > +* added support for metadata plugin > +* patch for problem with outerHeight returning 0 > +* fixed problem with title attribute conflict when using custom title > +* avoided opera bug for img loading countdown with ajax; this had the effect of not loading cluetip first time it was hovered > +* added initial semicolon to avoid problems with file concats > + > +== 0.9.6 == > + > +* fixed tip width measurement bug, which affected Safari > +* fixed dropShadow not appearing in edge cases. added overflow: hidden; to clueTip title > +* added title tag to list of tags to strip before serving up the requested file > + > +== 0.9.5 == > + > +* added clickThrough option to allow click to go to page, even if href and tipAttribute are equal. > +* added experimental mouse tracking option > +* added simple/experimental delayedClose option to allow auto-closing of clueTip after given number of milliseconds. > +* added "focus" as an available value for "activation" option. Will show clueTip on focus of a form element, hide on blur. > +* added support for bgiframe plugin. When the bgiframe plugin is referenced in the docuement, clueTip will use it (in IE6). > +* cleaned up default ajaxProcess option. > +* provided public access to all default plugin settings (thanks malsup!) > +* fixed bug (reported at http://jquery.com/plugins/node/941) when splitTitle is used and title attribute is empty > +* fixed bug where a variable was improperly nested in an if statement > +* fixed bug with incorrectly disabling link when no href is present in invoking element > +* fixed annoyance (reported at http://plugins.jquery.com/node/1081): default title attributes showing before cluetip when using long interval in hoverIntent. > +* fixed bug where hoverIntent's timeout setting wasn't working with mouseoutClose when user moused out of the clueTip > +* fixed problem with setting width option to "auto". Now, non-number widths such as 'auto' default to 275px. > +* fixed bug with activation by click where it wouldn't show clueTip under certain circumstances > + > +== 0.9.3 == > + > +* Fixed "arrows" option so that it now works for all three themes. Changed the way it works, and changed css to work better with it. > +* Removed rounded-corners theme's reliance on #cluetip-title for part of the background image. Now, you can hide the title without losing part of the clueTip's background. > +* Moved all images for arrows and rounded corners to a separate folder. > + > +== 0.9.2.2 == > + > +* added support for any selector expression to be used for grabbing local content. The plugin will just take the first element in the set of matched elements for its content. > +* release the cursor setting when clueTip is closed. > +* if jQuery 1.2.x is being used, local option uses .clone(true) and appends local element to clueTip (after emptying) so that events within that local content don't lose their binding > + > +== 0.9.2.1 == > + > +* added .clue-bottom-[cluetipClass] and .clue-top-[cluetipClass] when cluetip is positioned below or above the linked element. > +* added "fixed" as a possible value for the "positionBy" option. With this, the clueTip will always appear in the same position relative to the linked element. > +* added "topOffset" and "leftOffset" options. See documentation for details. > + > +== 0.9.0 == > + > +* fixed a couple bugs introduced by the new 'bottomTop' value for 'positionBy' in 0.8.7. > +* fixed the stray, content-less clueTip that was being left visible in certain situations. > + > +== 0.8.7 == > + > +* added 'bottomTop' as an available value for the "positionBy" option. > +* added ability to set hoverIntent options through cluetip's hoverIntent options > +* added height option that allows setting a static height for the clueTip and puts in a vertical scrollbar if the contents don't fit. That situation of course is not very usable unless the clueTip is sticky as well, so the user can actually scroll it. > + > +== 0.8.6 == > + > +* changed fx.open default to 'show' and fx.openSpeed default to '' (empty string) > +* ajaxed contents now wait until all images are loaded before being shown. Code generously provided by Torben Schreiter. > + > +== 0.8.5 == > + > +* changed waitImage option to Boolean. Now the wait image comes from the stylesheet, jquery.cluetip.css, as a background image. This is all in an attempt to avoid the annoying scroll jumping (see not for 0.8.4). > +* reverted "changed the way the waitImage is hidden" from 0.8.4. > + > +== 0.8.4 == > + > +* changed the way the waitImage is hidden, because of some bizarre scroll jumping that occurred on a couple sites. > +* added $.cluetip.setup() to allow for custom insertion type. appendTo is the default; other types are prependTo, insertBefore, and insertAfter. Also insertionElement allows user to determine where in the DOM the clueTip will be loaded > + > +== 0.8.3 == > + > +* added ajaxCache option, which caches the results of the ajax request to avoid unnecessary hits to the server (caching was already being done, but now it's optional). When set to false, the script will make an ajax request every time the clueTip is shown, which allows for dynamic content to be loaded. > +* added mouseOutClose option. Now, when you set both the sticky and the mouseOutClose option to true, the clueTip will hide when you either click the close link or mouse out of the clueTip altogether. > +* added behavior for ajaxSettings.error and ajaxSettings.complete. Now, regardless of success or error, the clueTip will be shown and the waitImage will be hidden. If there is an error, the contents of the clueTip will read: "sorry, contents could not be loaded." > + > +== 0.8.2 == > + > +* improved positioning of too-wide cluetips. > +* don't show the loading image if waitImage is set to empty string or false > +* changed y-positioning of loading image to be based on mouse position, as I think it will fix the scroll-jump bug as reported by to.rben on http://www.learningjquery.com/2007/07/cluetip-plugin-beta-2 > + > +== 0.8.1 == > + > +* for "closePosition" option, added ability to set it to "title" so that the close link can go in the clueTip's heading area. > + > +== 0.8 == > + > +Additional features/enhancements > +* changed <span id="cluetip-close"> to <div id="cluetip-close"> because I was (stupidly) setting its "display" property to "block" anyway. So, also removed .css('display','block) > +* added fx options: open, openSpeed, close, closeSpeed. open and close can take one of the jQuery core effects (fadeIn/fadeOut, show/hide, slideDown/slideUp); openSpeed and close Speed take, well, a speed. > +* added positionBy option. Default is "auto". When set to "mouse" will position the clueTip by the mouse position, not the element position > +* added cluezIndex option. Default is 97. Sets the z-index property of the clueTip > +* added cluetipClass option. Default is 'default'. This option adds a class to the #cluetip div for applying colors, backgrounds, etc. > +* added cursor option. Default is 'help'. This cursor type is used, when the tip attribute and the href are the same. > +* added dropShadowSteps option. Default is 6. This determines how big the drop shadow is (i.e. how many drop-shadow divs are created for the clueTip). Each "step" correlates to 1 pixel of drop shadow. > +* added brand-new rounded-corners theme. To use this, create a clueTip with at least these options .cluetip() {cluetipClass: 'rounded', dropShadow: false}) > +* enhanced positioning logic. If there isn't enough horizontal space for the clueTip to appear, either to the left or to the right, without intruding on the mouse position (and thus causing the clueTip to flicker on and off repeatedly), then its top is positioned 10 pixels below the mouse. However, if the clueTip would get partially cut off at the bottom of the viewable area, and if there is enough room for it between the top of the viewable area and the mouse position, then its bottom will be positioned 10 pixels above the mouse. > + > +Bug fixes > + > +* dealt with AJAX race condition, reported by to.rben: http://www.learningjquery.com/2007/07/cluetip-plugin-beta-2#comment-8786 > + > +* fixed problem with activation by click. Before, if a user clicked to show the clueTip, and then closed the clueTip by some other means than clicking the same link element, the user had to click twice to show the clueTip the next time. > + > +* general cleaning up and re-ordering of code > + > +== 0.7 == > + > +Additional features/enhancements > + > +* the waitImage feature/option is now implemented for ajax-loaded clueTips > +* the drop-shadow effect is now created with dynamically generated div elements with decreasing level of opacity. This allows for cross-browser compatibility without having to deal with png hacks. > +* added a dropShadow option that adds a drop shadow to the clueTip. Default is true > +* the clueTip heading (<h3>) now comes before <div id="cluetip-inner">, not inside it. This should make it much easier to apply sane CSS. > +* added alternate theme based on Cody Lindley’s jTip, and created demo files to show it (alt-demo.html, et. al.) > +* added an arrows option that sets the vertical background position to line up an image with the hovered element. Default is false. This option should be set to true for the alternate jTip theme. > +* <div id="cluetip"> now gets class="clue-left" if positioned to the left of the hovered element and class="clue-right" if positioned to the right. Useful for styling the clueTip differently based on where it displays, as is done in the jTip theme. > + > +Bug fixes > + > +* changed $(document).width() to the more appropriate $(window).width() for positioning the clueTip’s x coordinate. > +* changed the clueTip’s height calculation to occur after truncate and tipTitle options are considered so that positioning will be more accurate and drop shadows will be applied correctly. > +* fixed positioning glitch when applying clueTip to an area element; now it positions the clueTip relative to the mouse position. > > Added: branches/3.0/lib/jquery/cluetip/images/arrowdown.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/arrowdown.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/arrowleft.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/arrowleft.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/arrowright.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/arrowright.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/arrowup.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/arrowup.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/bl.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/bl.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/bl.png > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/bl.png > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/br.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/br.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/br.png > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/br.png > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/darrowdown.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/darrowdown.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/darrowleft.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/darrowleft.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/darrowright.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/darrowright.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/darrowup.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/darrowup.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/rarrowdown.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/rarrowdown.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/rarrowleft.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/rarrowleft.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/rarrowright.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/rarrowright.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/rarrowup.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/rarrowup.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/tl.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/tl.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/tl.png > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/tl.png > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/tr.gif > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/tr.gif > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/images/tr.png > =================================================================== > (Binary files differ) > > > Property changes on: branches/3.0/lib/jquery/cluetip/images/tr.png > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Added: branches/3.0/lib/jquery/cluetip/jquery-1.2.5.min.js > =================================================================== > --- branches/3.0/lib/jquery/cluetip/jquery-1.2.5.min.js (rev 0) > +++ branches/3.0/lib/jquery/cluetip/jquery-1.2.5.min.js 2009-03-02 20:14:21 UTC (rev 17086) > @@ -0,0 +1,32 @@ > +/* > + * jQuery 1.2.5 - New Wave Javascript > + * > + * Copyright (c) 2008 John Resig (jquery.com) > + * Dual licensed under the MIT (MIT-LICENSE.txt) > + * and GPL (GPL-LICENSE.txt) licenses. > + * > + * $Date: 2008-05-20 23:14:54 -0400 (Tue, 20 May 2008) $ > + * $Rev: 5651 $ > + */ > +(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else > +return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.5",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else > +return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else > +selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else > +return(this[0].value||"").replace(/\r/g,"");}return undefined;}return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else > +this.value=value;});},html:function(value){return value==undefined?(this.length?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else > +return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script")){scripts=scripts.add(elem);}else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else > +jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&©&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else > +script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else > +for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else > +for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else > +jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else > +ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(notxml&&!special&&name in elem){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&¬xml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);if(msie&&special&¬xml)return elem.getAttribute(name,2);return elem.getAttribute(name);}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else > +while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else > +while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a... [truncated message content] |
From: <lu...@us...> - 2009-03-02 20:24:14
|
Revision: 17087 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17087&view=rev Author: luciash Date: 2009-03-02 20:24:08 +0000 (Mon, 02 Mar 2009) Log Message: ----------- [ENH] better look for error message when db connection not found Modified Paths: -------------- branches/3.0/db/tiki-db-adodb.php branches/3.0/tiki-install.php Modified: branches/3.0/db/tiki-db-adodb.php =================================================================== --- branches/3.0/db/tiki-db-adodb.php 2009-03-02 20:14:21 UTC (rev 17086) +++ branches/3.0/db/tiki-db-adodb.php 2009-03-02 20:24:08 UTC (rev 17087) @@ -35,94 +35,40 @@ $dbTiki = &ADONewConnection($db_tiki); if (!@$dbTiki->Connect($host_tiki, $user_tiki, $pass_tiki, $dbs_tiki)) { - print '<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>Error: Unable to connect to the database !</title> - <link rel="stylesheet" href="styles/thenews.css" type="text/css"> -</head> -<body > - <div id="tiki-main"> - <div id="tiki-mid"> - <div style="margin:10px 30px;"> - <h1> - <font color="red">TikiWiki is unable to connect to the database.</font> - <a title="help" href="http://doc.tikiwiki.org/Installation" target="help"><img border="0" src="img/icons/help.gif" alt="Help" /></a> - </h1> - <p>The following error message was returned: - <div class="simplebox">'; - print $dbTiki->ErrorMsg(); - print '</div> - </p> - <p>Things to check: - <ul> - <li>Is your database up and running?</li> - <li>Are your database login credentials correct?</li> - <li>Did you complete the Tiki Installer?</li> - </ul> - </p> - <p>Please see <a href="http://doc.tikiwiki.org/">the documentation</a> for more information.</p> - </div> - </div> - <hr> - <p align="center"> - <a href="http://www.tikiwiki.org" title="TikiWiki"> - <img src="img/tiki/tikibutton2.png" alt="TikiWiki" border="0" height="31" width="80"> - </a> - </p> - </div> -</body> -</html> -'; - exit; + $title='Tiki is unable to connect to the database !'; + $content = " <p>The following error message was returned:</p>\n" . + " <strong>\n"; + $content .= ' '.$dbTiki->ErrorMsg(); + $content .= " </strong>\n" . + " <div class=\"wikitext\" style=\"border: solid 1px #ccc; margin: 1em auto; padding: 1em; text-align: left; width: 30%;\">\n" . + " <p>Things to check:</p>\n" . + " <ol class=\"fancylist\">\n" . + " <li><p>Is your database up and running?</p></li>\n" . + " <li><p>Are your database login credentials correct?</p></li>\n" . + " <li><p>Did you complete the Tiki Installer?</p></li>\n" . + " </ol>\n" . + " </div>\n" . + " <p>Please see <a href=\"http://doc.tikiwiki.org/\">the documentation</a> for more information.</p>\n"; + $dberror = true; + include_once('tiki-install.php'); } if (!@$dbTiki->Execute('select `login` from `users_users` limit 1')) { - print '<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>Error: Unable to retrieve login from the database !</title> - <link rel="stylesheet" href="styles/thenews.css" type="text/css"> -</head> -<body > - <div id="tiki-main"> - <div id="tiki-mid"> - <div style="margin:10px 30px;"> - <h1> - <font color="red">TikiWiki is unable to retrieve login data from the database.</font> - <a title="help" href="http://doc.tikiwiki.org/Installation" target="help"><img border="0" src="img/icons/help.gif" alt="Help" /></a> - </h1> - <p>The following error message was returned: - <div class="simplebox">'; - print $dbTiki->ErrorMsg(); - print '</div> - </p> - <p>Things to check: - <ul> - <li>Are your database login credentials correct?</li> - <li>Did you complete the Tiki Installer?</li> - </ul> - </p> - <p>Please see <a href="http://doc.tikiwiki.org/">the documentation</a> for more information.</p> - </div> - </div> - <hr> - <p align="center"> - <a href="http://www.tikiwiki.org" title="TikiWiki"> - <img src="img/tiki/tikibutton2.png" alt="TikiWiki" border="0" height="31" width="80"> - </a> - </p> - </div> -</body> -</html> -'; - exit; + $title='Tiki was unable to retrieve login data from the database !'; + $content = " <p>The following error message was returned:</p>\n" . + " <strong>\n"; + $content .= ' '.$dbTiki->ErrorMsg(); + $content .= " </strong>\n" . + " <div class=\"wikitext\" style=\"border: solid 1px #ccc; margin: 1em auto; padding: 1em; text-align: left; width: 30%;\">\n" . + " <p>Things to check:</p>\n" . + " <ol class=\"fancylist\">\n" . + " <li><p>Are your database login credentials correct?</p></li>\n" . + " <li><p>Did you complete the Tiki Installer?</p></li>\n" . + " </ol>\n" . + " </div>\n" . + " <p>Please see <a href=\"http://doc.tikiwiki.org/\">the documentation</a> for more information.</p>\n"; + $dberror = true; + include_once('tiki-install.php'); } if ($db_tiki == 'sybase') { Modified: branches/3.0/tiki-install.php =================================================================== --- branches/3.0/tiki-install.php 2009-03-02 20:14:21 UTC (rev 17086) +++ branches/3.0/tiki-install.php 2009-03-02 20:24:08 UTC (rev 17087) @@ -14,8 +14,9 @@ return true; } -$title=''; -$content=''; +if (!isset($title)) $title = ''; +if (!isset($content)) $content = ''; +if (!isset($dberror)) $dberror = false; if (version_compare(PHP_VERSION, '5.0.0', '<')) { $title='PHP5 is required for Tiki 3.0'; @@ -23,6 +24,10 @@ createPage($title,$content); } +if ($dberror===true) { + createPage($title,$content); +} + if( file_exists( 'db/lock' ) ) { $title='Tiki Installer Disabled'; $content=' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2009-03-02 21:27:19
|
Revision: 17090 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17090&view=rev Author: sylvieg Date: 2009-03-02 21:27:15 +0000 (Mon, 02 Mar 2009) Log Message: ----------- [FIX]tracker: to have also dynamic items list working in TRACKER Modified Paths: -------------- branches/3.0/lib/trackers/dynamic_list.js branches/3.0/lib/wiki-plugins/wikiplugin_tracker.php branches/3.0/templates/tiki-view_tracker.tpl branches/3.0/templates/tracker_item_field_input.tpl branches/3.0/tiki-view_tracker.php Modified: branches/3.0/lib/trackers/dynamic_list.js =================================================================== --- branches/3.0/lib/trackers/dynamic_list.js 2009-03-02 20:43:29 UTC (rev 17089) +++ branches/3.0/lib/trackers/dynamic_list.js 2009-03-02 21:27:15 UTC (rev 17090) @@ -9,6 +9,8 @@ for (var i=0; i < tabsel.length; i++) { sel[i] = document.getElementsByName("ins_" + tabsel[i])[0]; + if (typeof sel[i] == "undefined") + sel[i] = document.getElementsByName("track[" + tabsel[i]+"]")[0]; while (sel[i].childNodes.length != 0) { sel[i].removeChild(sel[i].lastChild); } Modified: branches/3.0/lib/wiki-plugins/wikiplugin_tracker.php =================================================================== --- branches/3.0/lib/wiki-plugins/wikiplugin_tracker.php 2009-03-02 20:43:29 UTC (rev 17089) +++ branches/3.0/lib/wiki-plugins/wikiplugin_tracker.php 2009-03-02 21:27:15 UTC (rev 17090) @@ -706,6 +706,26 @@ $opts[1] = split(':', $f['options_array'][1]); $finalFields = explode('|', $f['options_array'][3]); $flds['data'][$i]['value'] = $trklib->get_join_values($itemId, array_merge(array($f['options_array'][2]), array($f['options_array'][1]), array($finalFields[0])), $f['options_array'][0], $finalFields); + } elseif ($f['type'] == 'w') { + $refFieldId = $f['options_array'][2]; + foreach ($flds['data'] as $i=>$f) { + if ($f['fieldId'] == $refFieldId) { + $refFieldId = $i; + } + } + if (!isset($flds['data'][$refFieldId]['http_request'])) + $flds['data'][$refFieldId]['http_request'] = array('','','','','','','','',''); + for ($i = 0; $i < 5; $i++) { + $flds['data'][$refFieldId]['http_request'][$i] .= + ($flds['data'][$refFieldId]['http_request'][$i] ? "," : "") . + isset($f['options_array'][$i])?$f['options_array'][$i]:''; + } + $flds['data'][$refFieldId]['http_request'][5] .= + ($flds['data'][$refFieldId]['http_request'][5] ? ",":"") . + $f['fieldId']; + $flds['data'][$refFieldId]['http_request'][6] .= + ($flds['data'][$refFieldId]['http_request'][6] ? "," : "") . + $f['isMandatory']; } } } Modified: branches/3.0/templates/tiki-view_tracker.tpl =================================================================== --- branches/3.0/templates/tiki-view_tracker.tpl 2009-03-02 20:43:29 UTC (rev 17089) +++ branches/3.0/templates/tiki-view_tracker.tpl 2009-03-02 21:27:15 UTC (rev 17090) @@ -455,10 +455,8 @@ {* -------------------- dynamic list -------------------- *} {elseif $field_value.type eq 'w'} -<select name="{$field_value.ins_id}" {if $listfields.$fid.http_request}onchange="selectValues('trackerIdList={$listfields.$fid.http_request[0]}&fieldlist={$listfields.$fid.http_request[3]}&filterfield={$listfields.$fid.http_request[1]}&status={$listfields.$fid.http_request[4]}&mandatory={$listfields.$fid.http_request[6]}&filtervalue='+escape(this.value),'{$listfields.$fid.http_request[5]}')"{/if}> -</select> +{include file='tracker_item_field_input.tpl'} - {* -------------------- User subscription -------------------- *} {elseif $field_value.type eq 'U'} <input type="text" name="{$field_value.ins_id}" value="{$field_value.value}" /> Modified: branches/3.0/templates/tracker_item_field_input.tpl =================================================================== --- branches/3.0/templates/tracker_item_field_input.tpl 2009-03-02 20:43:29 UTC (rev 17089) +++ branches/3.0/templates/tracker_item_field_input.tpl 2009-03-02 21:27:15 UTC (rev 17090) @@ -321,7 +321,7 @@ {* -------------------- item link -------------------- *} {elseif $field_value.type eq 'r'} - <select name="{$field_value.ins_id}" {if $field_value.http_request}onchange="selectValues('trackerIdList={$field_value.http_request[0]}&fieldlist={$field_value.http_request[3]}&filterfield={$field_value.http_request[1]}&status={$field_value.http_request[4]}&mandatory={$field_value.http_request[6]}&filtervalue={$field_value.value}{$field_value.http_request[5]}')"{/if}> + <select name="{$field_value.ins_id}" {if $field_value.http_request}onchange="selectValues('trackerIdList={$field_value.http_request[0]}&fieldlist={$field_value.http_request[3]}&filterfield={$field_value.http_request[1]}&status={$field_value.http_request[4]}&mandatory={$field_value.http_request[6]}&filtervalue='+escape(this.value),'{$field_value.http_request[5]}')"{/if}> {if $field_value.isMandatory ne 'y' || empty($field_value.value)} <option value=""></option> {/if} @@ -340,7 +340,8 @@ {* -------------------- dynamic list -------------------- *} {elseif $field_value.type eq 'w'} - <select name="{$field_value.ins_id}" {if $field_value.http_request}onchange="selectValues('trackerIdList={$field_value.http_request[0]}&fieldlist={$field_value.http_request[3]}&filterfield={$field_value.http_request[1]}&status={$field_value.http_request[4]}&mandatory={$field_value.http_request[6]}&filtervalue={$field_value.value}{$field_value.http_request[5]}')"{/if}> + <script type="text/javascript" src="lib/trackers/dynamic_list.js"></script> +<select name="{$field_value.ins_id}" {if $field_value.http_request}onchange="selectValues('trackerIdList={$field_value.http_request[0]}&fieldlist={$field_value.http_request[3]}&filterfield={$field_value.http_request[1]}&status={$field_value.http_request[4]}&mandatory={$field_value.http_request[6]}&filtervalue={$field_value.value}{$field_value.http_request[5]}')"{/if}> </select> Modified: branches/3.0/tiki-view_tracker.php =================================================================== --- branches/3.0/tiki-view_tracker.php 2009-03-02 20:43:29 UTC (rev 17089) +++ branches/3.0/tiki-view_tracker.php 2009-03-02 21:27:15 UTC (rev 17090) @@ -494,7 +494,6 @@ $fields['data'][$i]['lingualpvalue'][$num]['value'] = $tikilib->parse_data(htmlspecialchars($_REQUEST[$ins_id][$tmplang])); } - echo 'gggg'.$ins_id;print_r($fields['data'][$i]['lingualvalue']);print_r($_REQUEST); $ins_fields['data'][$i]['lingualpvalue']=$fields['data'][$i]['lingualpvalue']; $ins_fields['data'][$i]['lingualvalue']=$fields['data'][$i]['lingualvalue']; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2009-03-02 23:06:51
|
Revision: 17096 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17096&view=rev Author: sylvieg Date: 2009-03-02 23:06:41 +0000 (Mon, 02 Mar 2009) Log Message: ----------- [FIX] change_language was lost Modified Paths: -------------- branches/3.0/templates/tiki-admin-include-i18n.tpl branches/3.0/tiki-admin_include_i18n.php Modified: branches/3.0/templates/tiki-admin-include-i18n.tpl =================================================================== --- branches/3.0/templates/tiki-admin-include-i18n.tpl 2009-03-02 22:57:11 UTC (rev 17095) +++ branches/3.0/templates/tiki-admin-include-i18n.tpl 2009-03-02 23:06:41 UTC (rev 17096) @@ -74,8 +74,10 @@ <td><input type="checkbox" name="feature_detect_language" id="feature_detect_language" {if $prefs.feature_detect_language eq 'y'}checked="checked"{/if}/></td> </tr><tr> + <td class="form"><label for="change_language">{tr}Users can change language{/tr}:</label></td> + <td><input type="checkbox" name="change_language" id="change_language"{if $prefs.change_language eq 'y'} checked="checked"{/if}> + </tr><tr> - <td class="form"><label for="restrict_language">{tr}Restrict supported languages{/tr}:</label></td> <td><input type="checkbox" name="restrict_language" id="restrict_language" {if count($prefs.available_languages) > 0}checked="checked"{/if} Modified: branches/3.0/tiki-admin_include_i18n.php =================================================================== --- branches/3.0/tiki-admin_include_i18n.php 2009-03-02 22:57:11 UTC (rev 17095) +++ branches/3.0/tiki-admin_include_i18n.php 2009-03-02 23:06:41 UTC (rev 17096) @@ -19,12 +19,6 @@ if (isset($_REQUEST["i18nsetup"])) { ask_ticket('admin-inc-i18n'); - if( isset( $_REQUEST['available_languages'] ) - && count( $_REQUEST['available_languages'] ) > 0 ) - { - $_REQUEST['change_language'] = 'on'; - } - $pref_toggles = array( "feature_multilingual", 'feature_translation', @@ -33,8 +27,7 @@ "feature_best_language", 'feature_sync_language', "feature_detect_language", -// This option should be re-added to this page, no? -// "change_language", + "change_language", "quantify_changes", "feature_user_watches_translations", "lang_use_db", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ny...@us...> - 2009-03-02 22:17:42
|
Revision: 17092 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17092&view=rev Author: nyloth Date: 2009-03-02 22:17:31 +0000 (Mon, 02 Mar 2009) Log Message: ----------- [NEW] release_copyright.php in doc/devtools intended to update the copyright.txt during the release process + update release doc + clean release shell script to remove obsolete tasks + remove useless bin directory Modified Paths: -------------- branches/3.0/doc/devtools/svntools.php branches/3.0/doc/devtools/tikirelease.sh Added Paths: ----------- branches/3.0/doc/devtools/release_copyright.php Removed Paths: ------------- branches/3.0/bin/ Added: branches/3.0/doc/devtools/release_copyright.php =================================================================== --- branches/3.0/doc/devtools/release_copyright.php (rev 0) +++ branches/3.0/doc/devtools/release_copyright.php 2009-03-02 22:17:31 UTC (rev 17092) @@ -0,0 +1,134 @@ +<?php +define( 'TOOLS', dirname(__FILE__) ); +define( 'ROOT', realpath( TOOLS . '/../..' ) ); +define( 'COPYRIGHTS', ROOT . '/copyright.txt' ); +define( 'SF_TW_MEMBERS_URL', 'http://sourceforge.net/project/memberlist.php?group_id=64258' ); + +require_once TOOLS . '/svntools.php'; + +if( $_SERVER['argc'] <= 1 ) + die( "Usage: php doc/devtools/release_copyright.php <version-number> +Example: + php doc/devtools/release_copyright.php 2.0 +" ); +$newVersion = $_SERVER['argv'][1]; + +if ( empty($newVersion) ) { + error('No version specified.'); + die; +} +if ( ! is_readable(COPYRIGHTS) || ! is_writable(COPYRIGHTS) ) { + error('The copyright file "' . COPYRIGHTS . '" is not readable or writable.'); + die; +} + +important('Updating copyrights...'); + +$nbCommiters = 0; +$contributors = array(); +$repositoryInfo = get_info(TIKISVN); + +get_contributors_data(TIKISVN, $contributors, 1, (int)get_info($source)->entry->commit['revision']); +ksort($contributors); + +$totalContributors = count($contributors); +$now = date('Y-m-d'); + +$copyrights = <<<EOS +Tiki Copyright +---------------- + +The following list gathers the copyrights holders for tikiwiki +at the state of $newVersion version. Each member of that list wrote +at least one line, directly or indirectly, in tikiwiki code source. +The exact proportion of the contribution of each is not an issue, +as any copyright change will involve the agreement of everybody. + +This is how we implement the TikiwikiSocialContract. +http://dev.tikiwiki.org/SocialContract + +List of members of the Community +As of on $now, the community has: + * $totalContributors members on Sourceforge, + * $nbCommiters of those people who made at least one commit + +This list is automatically generated and alphabetically sorted +from subversion repository by the following script: + doc/devtools/release_copyright.php + +==================================================================== + +EOS; + +foreach ( $contributors as $author => $infos ) { + $copyrights .= "\nNickname: $author"; + if ( !empty($infos['realName']) && $infos['realName'] != $author ) $copyrights .= "\nName: ".$infos['realName']; + if ( !empty($infos['first_commit']) ) $copyrights .= "\nFirst Commit: ".$infos['first_commit']; + if ( !empty($infos['last_commit']) ) $copyrights .= "\nLast Commit: ".$infos['last_commit']; + if ( !empty($infos['nb_commits']) ) $copyrights .= "\nNumber of Commits: ".$infos['nb_commits']; + if ( !empty($infos['role']) ) $copyrights .= "\nSF Role: ".$infos['role']; + $copyrights .= "\n"; +} + +file_put_contents(COPYRIGHTS, $copyrights); + +function get_contributors_data($path, &$contributors, $minRevision, $maxRevision, $step = 5000) { + global $nbCommiters; + if ( empty($contributors) ) get_contributors_sf_data($contributors); + + $minByStep = max($maxRevision - $step, $minRevision); + $lastLogRevision = $maxRevision; + info("Retrieving logs from revision $minByStep to $maxRevision ..."); + $logs = get_logs( $path, $minByStep, $maxRevision); + if ( preg_match_all('/^r(\d+) \|\s([^\|]+)\s\|\s(\d+-\d+-\d+)\s.*\n\n(.*)\-+\n/Ums', $logs, $matches, PREG_SET_ORDER) ) { + foreach ( $matches as $logEntry ) { + if ( $lastLogRevision > 0 && $logEntry[1] != $lastLogRevision - 1 && $lastLogRevision != $maxRevision ) { + print "\nProblem with commit ".( $lastLogRevision - 1 )."\n (trying {$logEntry[1]} after $lastLogRevision)"; + die; + } + $lastLogRevision = $logEntry[1]; + $author = strtolower($logEntry[2]); + if ( empty( $author ) || $author == '(no author)' ) continue; + + if ( !isset($contributors[$author]) ) $contributors[$author] = array(); + + $contributors[$author]['author'] = $logEntry[2]; + $contributors[$author]['last_commit'] = $logEntry[2]; + $contributors[$author]['first_commit'] = $logEntry[3]; + + if ( isset($contributors[$author]['nb_commits']) ) { + $contributors[$author]['nb_commits']++; + } else { + $nbCommiters++; + $contributors[$author]['nb_commits'] = 1; + } + } + } + if ( $lastLogRevision > $minRevision ) get_contributors_data($path, $contributors, $minRevision, $lastLogRevision - 1, $step); + return $contributors; +} + +function get_contributors_sf_data(&$contributors) { + $members = ''; + $matches = array(); + $userParsedInfo = array(); + $html = file_get_contents(SF_TW_MEMBERS_URL); + + if ( !empty($html) && preg_match('/(<table.*<\/\s*table>)/sim', $html, $matches) ) { + $usersInfo = array(); + if ( preg_match_all('/<tr[^>]*>'.str_repeat('\s*<td[^>]*>(.*)<\/td>\s*',4).'<\/\s*tr>/Usim', $matches[0], $usersInfo, PREG_SET_ORDER) ) { + foreach ( $usersInfo as $k => $userInfo ) { + $userInfo = array_map('trim', array_map('strip_tags', $userInfo)); + $user = strtolower($userInfo['2']); + if ( empty($user) ) continue; + $contributors[$user] = array( + 'realName' => html_entity_decode(iconv("ISO-8859-15", "UTF-8", $userInfo['1']), ENT_COMPAT, 'UTF-8'), + 'role' => $userInfo['3'] + ); + } + } + } else { + error('Impossible to get SF.net users information.'); + die; + } +} Modified: branches/3.0/doc/devtools/svntools.php =================================================================== --- branches/3.0/doc/devtools/svntools.php 2009-03-02 21:46:59 UTC (rev 17091) +++ branches/3.0/doc/devtools/svntools.php 2009-03-02 22:17:31 UTC (rev 17092) @@ -174,10 +174,6 @@ function get_logs( $localPath, $minRevision, $maxRevision = 'HEAD' ) { if ( empty($minRevision) || empty($maxRevision) ) return false; - $logs = ''; - - // svn log -rHEAD:15184 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/3.0 $logs = `svn log -r$maxRevision:$minRevision $localPath`; - return $logs; } Modified: branches/3.0/doc/devtools/tikirelease.sh =================================================================== --- branches/3.0/doc/devtools/tikirelease.sh 2009-03-02 21:46:59 UTC (rev 17091) +++ branches/3.0/doc/devtools/tikirelease.sh 2009-03-02 22:17:31 UTC (rev 17092) @@ -1,18 +1,19 @@ #!/bin/sh # $Id$ -# originally written by mose (mose.com) # +# =========================================================== +# IMPORTANT NOTE : This script should not be called manually. +# It is called by doc/devtools/release.php +# =========================================================== +# # HOWTO release Tikiwiki ? # -------------------------- -# # # pre/ -# - update changelog.txt (from SVN commit logs) -# - update copyright.txt (we _need_ a way to automate this - it was omitted for 1.9.2 release) +# - run doc/devtools/release_changelog.php to update changelog.txt and check the diff with the last version +# - run doc/devtools/release_copyright.php to update copyright.txt and check the diff with the last version # - update README -# - update all links in the application to the online documentation -# - before first Release Candidate, proceed to the cleanup of admin panels (ex.: making sure all -# settings are in the appropriate tab, etc.) +# - Test the whole Installer and check if everything is OK # - run doc/devtools/securitycheck.php and check each "potentially unsafe" file. # - run doc/devtools/diffsql.sh to make sure tiki.sql and upgrade script from # previous version give the same db structure (but not necessarily the same data). @@ -23,7 +24,6 @@ # - in lib/setup/twversion.class.php # - increment the version number in the constructor # - update list of valid releases in getVersions() -# - check for PHP syntax errors: find . -type f -name \*.php -exec php -l {} \; | grep Parse # - commit your changes # # 1/ Create and test pre-release packages by executing the script with the release @@ -94,23 +94,15 @@ mkdir $VER cd $VER svn export $SVNROOT/$RELTAG $MODULE-$VER -find $MODULE-$VER -name CVS -type d | xargs -- rm -rf -find $MODULE-$VER -name .svn -type d | xargs -- rm -rf find $MODULE-$VER -name .cvsignore -type f -exec rm -f {} \; find $MODULE-$VER -name .svnignore -type f -exec rm -f {} \; -find $MODULE-$VER -name Thumbs.db -exec rm -f {} \; find $MODULE-$VER -type d -exec chmod 775 {} \; find $MODULE-$VER -type f -exec chmod 664 {} \; + # some more cleanup rm -rf $MODULE-$VER/tests rm -rf $MODULE-$VER/db/convertscripts -rm -rf $MODULE-$VER/db/convert_nulls_to_non_nulls.* rm -rf $MODULE-$VER/doc/devtools -rm -rf $MODULE-$VER/bin -rm -rf $MODULE-$VER/CVSROOT -rm -rf $MODULE-$VER/SPIDERCORE -rm -rf $MODULE-$VER/Smarty -rm -rf $MODULE-$VER/templates_c/%* tar -czf $MODULE-$VER.tar.gz $MODULE-$VER tar -cjf $MODULE-$VER.tar.bz2 $MODULE-$VER This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2009-03-02 23:36:59
|
Revision: 17099 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17099&view=rev Author: nkoth Date: 2009-03-02 23:36:44 +0000 (Mon, 02 Mar 2009) Log Message: ----------- [REL] Updated for 3.0beta1 Modified Paths: -------------- branches/3.0/changelog.txt branches/3.0/copyright.txt branches/3.0/doc/devtools/release_changelog.php branches/3.0/doc/devtools/release_copyright.php branches/3.0/lib/setup/twversion.class.php Modified: branches/3.0/changelog.txt =================================================================== --- branches/3.0/changelog.txt 2009-03-02 23:35:41 UTC (rev 17098) +++ branches/3.0/changelog.txt 2009-03-02 23:36:44 UTC (rev 17099) @@ -19,6 +19,9513 @@ Before 2.0, there was only [MOD] for both [ENH] and [MOD]: ---------------------------------------------------------------------- +Version 3.0 +<http://tikiwiki.org/ReleaseNotes30> +------------------ + +---------------------------------------------- +r17097 | marclaporte | 2009-03-02 18:16:06 -0500 (Mon, 02 Mar 2009) | 1 line + +[ENH] Improving copyright text plus small fix from nyloth +---------------------------------------------- +r17096 | sylvieg | 2009-03-02 18:06:41 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX] change_language was lost +---------------------------------------------- +r17095 | Jyhem | 2009-03-02 17:57:11 -0500 (Mon, 02 Mar 2009) | 1 line + +[ENH] Add link to step 6 +---------------------------------------------- +r17094 | sylvieg | 2009-03-02 17:45:08 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX]tracker: try to improve tracker rating by displaying both total and average -> to do in trunk: sort on average and option to choose what to display average?sum? +---------------------------------------------- +r17093 | nyloth | 2009-03-02 17:18:48 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX] fix release_changelog usage text +---------------------------------------------- +r17092 | nyloth | 2009-03-02 17:17:31 -0500 (Mon, 02 Mar 2009) | 1 line + +[NEW] release_copyright.php in doc/devtools intended to update the copyright.txt during the release process + update release doc + clean release shell script to remove obsolete tasks + remove useless bin directory +---------------------------------------------- +r17091 | marclaporte | 2009-03-02 16:46:59 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX] No use to have date, version and debug activated by default +---------------------------------------------- +r17090 | sylvieg | 2009-03-02 16:27:15 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX]tracker: to have also dynamic items list working in TRACKER +---------------------------------------------- +r17089 | chibaguy | 2009-03-02 15:43:29 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX] Title bar label and variable changed to Browser title and variable. +---------------------------------------------- +r17088 | Jyhem | 2009-03-02 15:41:39 -0500 (Mon, 02 Mar 2009) | 1 line + +[ENH] Explain that the file is obsolete on top, too +---------------------------------------------- +r17087 | luciash | 2009-03-02 15:24:08 -0500 (Mon, 02 Mar 2009) | 1 line + +[ENH] better look for error message when db connection not found +---------------------------------------------- +r17081 | nkoth | 2009-03-02 13:37:17 -0500 (Mon, 02 Mar 2009) | 2 lines + +[MOD] Make category filter om admin profiles be a drop-down selector of available cats + +---------------------------------------------- +r17080 | marclaporte | 2009-03-02 12:34:09 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX] Fix link to documentation +---------------------------------------------- +r17079 | Jyhem | 2009-03-02 12:12:27 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX] Update explanation of punctuation handling in translations +---------------------------------------------- +r17078 | marclaporte | 2009-03-02 12:05:26 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX] profile name changed +---------------------------------------------- +r17076 | marclaporte | 2009-03-02 11:40:56 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX] trimming down to just one profile for the Beta +---------------------------------------------- +r17074 | Jyhem | 2009-03-02 11:11:45 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX] Correct english text (thanks Marc) +---------------------------------------------- +r17062 | amette | 2009-03-02 00:48:11 -0500 (Mon, 02 Mar 2009) | 2 lines + +We don't have www.tw.o only tw.o + +---------------------------------------------- +r17061 | marclaporte | 2009-03-02 00:24:24 -0500 (Mon, 02 Mar 2009) | 1 line + +[FIX] Remove not so useful column in the plugin help, to provide more data on screen. +---------------------------------------------- +r17060 | amette | 2009-03-02 00:07:47 -0500 (Mon, 02 Mar 2009) | 2 lines + +Correct link to Release Notes in installer + +---------------------------------------------- +r17059 | amette | 2009-03-01 23:46:59 -0500 (Sun, 01 Mar 2009) | 2 lines + +Adjust links to sites in installer - we don't have www.tw.o but only tw.o + +---------------------------------------------- +r17058 | amette | 2009-03-01 23:19:11 -0500 (Sun, 01 Mar 2009) | 2 lines + +Don't rewrite, if URL points at an existing file - no need to maintain extensions + +---------------------------------------------- +r17057 | marclaporte | 2009-03-01 22:38:18 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX] Unbreakable spaces in login box to make it cleaner. Better solution like buttons may be coming shortly from someone else. +---------------------------------------------- +r17056 | nkoth | 2009-03-01 22:21:24 -0500 (Sun, 01 Mar 2009) | 1 line + +[REL] SecDB for 3.0beta1 +---------------------------------------------- +r17055 | nyloth | 2009-03-01 20:09:28 -0500 (Sun, 01 Mar 2009) | 1 line + +[NEW] release_changelog.php in doc/devtools intended to update the changelog just before the final release +---------------------------------------------- +r17054 | luciash | 2009-03-01 20:04:05 -0500 (Sun, 01 Mar 2009) | 1 line + +[SVN] proper Id property +---------------------------------------------- +r17053 | luciash | 2009-03-01 19:53:01 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX] when checking for new version don't display preference note but information instead +---------------------------------------------- +r17052 | marclaporte | 2009-03-01 19:20:57 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX] Restore automatic pick of last two versions as default diff. Tks Nyloth +---------------------------------------------- +r17051 | nkoth | 2009-03-01 19:12:26 -0500 (Sun, 01 Mar 2009) | 2 lines + +[FIX] show proper erroe message when mediawiki import TextWiki libs are missing + +---------------------------------------------- +r17050 | luciash | 2009-03-01 19:06:57 -0500 (Sun, 01 Mar 2009) | 1 line + +[ENH] display diffs 50/50 +---------------------------------------------- +r17049 | chibaguy | 2009-03-01 18:50:35 -0500 (Sun, 01 Mar 2009) | 1 line + +[ENH] Removed padding in siteloginbar for better consistency with search form. +---------------------------------------------- +r17048 | marclaporte | 2009-03-01 18:49:30 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX] Some changes related to the fact that a default diff style is now set for the site, to avoid to have the diff which happens automatically +---------------------------------------------- +r17047 | nkoth | 2009-03-01 18:40:23 -0500 (Sun, 01 Mar 2009) | 2 lines + +[SEC] prevent access to devtools from web just in case + +---------------------------------------------- +r17046 | Jyhem | 2009-03-01 18:24:26 -0500 (Sun, 01 Mar 2009) | 1 line + +[SEC] Added even more security checks +---------------------------------------------- +r17045 | luciash | 2009-03-01 18:22:49 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX] code wikiplugin: nicely aligned codecaption with codelisting +---------------------------------------------- +r17044 | Jyhem | 2009-03-01 18:08:37 -0500 (Sun, 01 Mar 2009) | 1 line + +[SEC] Added security checks +---------------------------------------------- +r17043 | nkoth | 2009-03-01 18:04:54 -0500 (Sun, 01 Mar 2009) | 2 lines + +[FIX] add permission/includeonly checks on files + +---------------------------------------------- +r17042 | marclaporte | 2009-03-01 18:01:45 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX] Group Alert is a very cool feature but shouldn't be on by default +---------------------------------------------- +r17041 | marclaporte | 2009-03-01 17:48:17 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX] Site Title, subtitle, logo title and Alt desciption on logo were limited to 50 characters. Now up to 200. +---------------------------------------------- +r17040 | luciash | 2009-03-01 16:51:52 -0500 (Sun, 01 Mar 2009) | 1 line + +[MOD] siteTitle -> browsertitle +---------------------------------------------- +r17039 | luciash | 2009-03-01 16:39:26 -0500 (Sun, 01 Mar 2009) | 1 line + +[MOD] browsertitle moved back to general prefs +---------------------------------------------- +r17037 | luciash | 2009-03-01 16:32:05 -0500 (Sun, 01 Mar 2009) | 1 line + +[MOD] preferences: siteTitle -> browsertitle + put it on General under Site Identity fieldset + link for more site customization to L&F + one tab less (moving the version check) +---------------------------------------------- +r17036 | sylvieg | 2009-03-01 16:31:19 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX]application menu: add tiki-admin.php on each Admin option to have a link like others section to the main page and not a javascript toggle +---------------------------------------------- +r17035 | luciash | 2009-03-01 16:27:49 -0500 (Sun, 01 Mar 2009) | 1 line + +[MOD] preferences: siteTitle -> browsertitle +---------------------------------------------- +r17032 | marclaporte | 2009-03-01 15:29:43 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX] changing language is no longer handled in tiki-admin.php?page=login +---------------------------------------------- +r17031 | sylvieg | 2009-03-01 14:56:36 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX]tracker: page rename must update page selector +---------------------------------------------- +r17029 | sylvieg | 2009-03-01 14:22:57 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX]error: do not redirect on login if error on password change +---------------------------------------------- +r17028 | marclaporte | 2009-03-01 14:09:51 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX] Matching value in prefs to the value in the form, to avoid unexpected setting change, when saving. Tks Nyloth +---------------------------------------------- +r17027 | chibaguy | 2009-03-01 13:39:52 -0500 (Sun, 01 Mar 2009) | 1 line + +[ENH] Removed previous fix and added vertical-align:top to td, which should be sufficient. +---------------------------------------------- +r17026 | chibaguy | 2009-03-01 13:24:35 -0500 (Sun, 01 Mar 2009) | 1 line + +[ENH] table.admin td.form bottom borders added to improve plugin list readability on tiki-admin.php?page=textarea. Kept mellow because these tds appear on other admin pages too. Feedback requested. +---------------------------------------------- +r17025 | sylvieg | 2009-03-01 12:52:04 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX]darkroom: do not wrap tab label +---------------------------------------------- +r17024 | chibaguy | 2009-03-01 12:10:48 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX] Browser title and page-top (L&F) title still interfering with each other. Browser title variable changed and admin moved from admin general to look and feel. This is partial fix; browser title still using prefs value despite new input on admin L&F. +---------------------------------------------- +r17023 | marclaporte | 2009-03-01 11:13:12 -0500 (Sun, 01 Mar 2009) | 1 line + +[ENH] In installer, remembers values for host, username and database (but not password) upon unsuccessful attempt to create db/local.php Thanks nyloth +---------------------------------------------- +r17021 | Jyhem | 2009-03-01 10:41:08 -0500 (Sun, 01 Mar 2009) | 1 line + +[ENH] Translations +---------------------------------------------- +r17019 | marclaporte | 2009-03-01 10:31:58 -0500 (Sun, 01 Mar 2009) | 1 line + +[FIX] Upon visiting the root directory of Tiki, if db/local/php is not found, assume this is a new install and send to the installer. +---------------------------------------------- +r17017 | luciash | 2009-02-28 20:23:36 -0500 (Sat, 28 Feb 2009) | 1 line + +[FIX] starting tag of </p> was missing, changed 'site administrator' to 'system administrator' +---------------------------------------------- +r17015 | luciash | 2009-02-28 18:21:36 -0500 (Sat, 28 Feb 2009) | 1 line + +[FIX] login prefs: change_theme is done on look and feel now - remove from here to prevent unwanted toggling off after applying login changes +---------------------------------------------- +r17014 | campbe13 | 2009-02-28 17:55:51 -0500 (Sat, 28 Feb 2009) | 1 line + +[Fix] check for php vers in setup +---------------------------------------------- +r17013 | nyloth | 2009-02-28 17:55:06 -0500 (Sat, 28 Feb 2009) | 1 line + +[ENH] release script: add a syntax check of PHP files and stop the release process if a parsing error has been found. +---------------------------------------------- +r17012 | luciash | 2009-02-28 17:21:06 -0500 (Sat, 28 Feb 2009) | 1 line + +[ENH] add the logo +---------------------------------------------- +r17011 | Jyhem | 2009-02-28 16:31:11 -0500 (Sat, 28 Feb 2009) | 1 line + +[FIX] If installation happens in https, the default suggestion for https config needs to be https compatible +---------------------------------------------- +r17010 | luciash | 2009-02-28 16:20:54 -0500 (Sat, 28 Feb 2009) | 1 line + +[ENH] make the messages translantable when local.php not found +---------------------------------------------- +r17005 | nkoth | 2009-02-28 13:14:05 -0500 (Sat, 28 Feb 2009) | 1 line + +[REL] SecDB for 3.0beta1 +---------------------------------------------- +r17004 | nkoth | 2009-02-28 13:03:22 -0500 (Sat, 28 Feb 2009) | 2 lines + +[FIX]mb: reintroduce the test to mb existence as th mb strings is not by default in php + +---------------------------------------------- +r16998 | nkoth | 2009-02-28 11:14:12 -0500 (Sat, 28 Feb 2009) | 1 line + +[BRANCH] Creation, trunk 0 to 16997 +---------------------------------------------- +r16997 | nkoth | 2009-02-28 10:46:45 -0500 (Sat, 28 Feb 2009) | 1 line + +[REL] SecDB for 3.0beta1 +---------------------------------------------- +r16996 | Jyhem | 2009-02-28 10:38:22 -0500 (Sat, 28 Feb 2009) | 1 line + +[FIX] Has been replaced by tiki-testGD.php +---------------------------------------------- +r16995 | Jyhem | 2009-02-28 10:32:19 -0500 (Sat, 28 Feb 2009) | 2 lines + +[UI] Don't display "Go back" link when it does not make sense + +---------------------------------------------- +r16994 | sylvieg | 2009-02-27 16:51:12 -0500 (Fri, 27 Feb 2009) | 1 line + +[FIX]theme: to have wysiwyg when changing theme +---------------------------------------------- +r16993 | nyloth | 2009-02-27 15:57:48 -0500 (Fri, 27 Feb 2009) | 1 line + +[FIX] icons: since themes could have their own icons, empty the icon cache when the theme has changed (thx chibaguy) +---------------------------------------------- +r16992 | sewilco | 2009-02-27 15:28:40 -0500 (Fri, 27 Feb 2009) | 1 line + +[BUG] fix reversed hit tally test on a gallery. +---------------------------------------------- +r16983 | sylvieg | 2009-02-27 11:53:52 -0500 (Fri, 27 Feb 2009) | 1 line + +[FIX]tracker: sorry rollback to 16957(test on item caetgory perm is not ready) + put the test null date +---------------------------------------------- +r16980 | luciash | 2009-02-27 07:01:22 -0500 (Fri, 27 Feb 2009) | 1 line + +[FIX] tikilib: embed_flash() correct xhtml output in case JS is off on client side +---------------------------------------------- +r16976 | luciash | 2009-02-27 05:28:52 -0500 (Fri, 27 Feb 2009) | 1 line + +[FIX] padding by changing the class, removed useless return to homepage +---------------------------------------------- +r16975 | chibaguy | 2009-02-26 19:17:41 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] Make hover behavior consistent with other buttons. +---------------------------------------------- +r16974 | chibaguy | 2009-02-26 19:12:12 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] Inconsistent a and a:hover padding caused movement in phpl menu. +---------------------------------------------- +r16973 | chibaguy | 2009-02-26 19:02:48 -0500 (Thu, 26 Feb 2009) | 1 line + +[ENH] Added title "Top" to legend # anchors. +---------------------------------------------- +r16972 | chibaguy | 2009-02-26 18:47:37 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] Replaced class name of div class="button". +---------------------------------------------- +r16971 | chibaguy | 2009-02-26 18:35:56 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] Moved checkbox out of link to # so page doesn't jump when checkbox is checked. +---------------------------------------------- +r16970 | chibaguy | 2009-02-26 17:52:18 -0500 (Thu, 26 Feb 2009) | 1 line + +[ENH] More padding on tiki-user_preferences.tpl. +---------------------------------------------- +r16969 | chibaguy | 2009-02-26 17:51:12 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] Replaced class name of td class="button". +---------------------------------------------- +r16968 | chibaguy | 2009-02-26 17:18:12 -0500 (Thu, 26 Feb 2009) | 1 line + +[ENH] 100% width on legend squeezed out margin on right side. +---------------------------------------------- +r16967 | chibaguy | 2009-02-26 17:02:19 -0500 (Thu, 26 Feb 2009) | 1 line + +[ENH] Quote plugin effect more obvious. +---------------------------------------------- +r16966 | luciash | 2009-02-26 16:55:17 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] a new try to have nice alpha transparent images in MSIE=<6, at least the logo looks better when it becomes nicely blended on various backgrounds ;) +---------------------------------------------- +r16965 | marclaporte | 2009-02-26 16:31:25 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] link to profiles is now in icon at the top +---------------------------------------------- +r16964 | chibaguy | 2009-02-26 15:49:03 -0500 (Thu, 26 Feb 2009) | 1 line + +[ENH] Minor improvements in PHPL tree menu. +---------------------------------------------- +r16963 | marclaporte | 2009-02-26 15:47:24 -0500 (Thu, 26 Feb 2009) | 1 line + +[MOD] Removing orphan pages from bare-bones default clean install. luci: we'll put it back in for community sites. +---------------------------------------------- +r16962 | marclaporte | 2009-02-26 15:39:09 -0500 (Thu, 26 Feb 2009) | 1 line + +[MOD] On creation of new image galleries, no longer show XY size. This is cleaner. +---------------------------------------------- +r16961 | pkdille | 2009-02-26 15:31:13 -0500 (Thu, 26 Feb 2009) | 1 line + +[MOD] articles: some tiny arrangement on a few grids (adding an icon, reorganizing action column, ...) +---------------------------------------------- +r16960 | pkdille | 2009-02-26 15:21:37 -0500 (Thu, 26 Feb 2009) | 1 line + +[MOD] code indent - no changes +---------------------------------------------- +r16959 | pkdille | 2009-02-26 14:58:59 -0500 (Thu, 26 Feb 2009) | 1 line + +[MOD] code indent - no changes +---------------------------------------------- +r16958 | sylvieg | 2009-02-26 13:59:07 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX]computed date: value must be null if computed with a null date + keep computed type not to display input field +---------------------------------------------- +r16957 | chibaguy | 2009-02-26 13:46:35 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] Rolling back menuLevel0 no-arrow change; effect was too strong. +---------------------------------------------- +r16955 | chibaguy | 2009-02-26 13:21:08 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] CSS menu dropdown border added (missing due to cssmenus.css change apparently). +---------------------------------------------- +r16954 | sewilco | 2009-02-26 12:22:34 -0500 (Thu, 26 Feb 2009) | 1 line + +[ENH] fix my messed up indentation +---------------------------------------------- +r16953 | chibaguy | 2009-02-26 12:21:42 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] No down arrow when menu is limited to level 0 (dropdowns not displayed); reduced default color a little (should be provided by theme in principle). +---------------------------------------------- +r16952 | sewilco | 2009-02-26 12:00:45 -0500 (Thu, 26 Feb 2009) | 1 line + +[ENH] minor cleanup +---------------------------------------------- +r16951 | chibaguy | 2009-02-26 11:48:35 -0500 (Thu, 26 Feb 2009) | 1 line + +[ENH] PHP Layers tree menu styles more consistent with themes. +---------------------------------------------- +r16950 | sylvieg | 2009-02-26 11:25:27 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX]pluginmanager: for plugin like dbreport that have a class WikipluginDBReport but does not have the method getDescription... pick up in the info +---------------------------------------------- +r16949 | sewilco | 2009-02-26 11:15:07 -0500 (Thu, 26 Feb 2009) | 1 line + +[ENH] IMAGE plugin restricts one of filegal, imagegal, URL. +---------------------------------------------- +r16947 | sylvieg | 2009-02-26 09:13:53 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] also add the upgrade script to have a link on the 'Admin' option to be sync with a fresh install +---------------------------------------------- +r16944 | chibaguy | 2009-02-26 00:05:40 -0500 (Thu, 26 Feb 2009) | 1 line + +[FIX] Prevent arrows in calendar tabrow from repeating vertically. +---------------------------------------------- +r16943 | chibaguy | 2009-02-25 23:30:49 -0500 (Wed, 25 Feb 2009) | 1 line + +[FIX] Enable CSS menu child lists to display. +---------------------------------------------- +r16942 | sewilco | 2009-02-25 19:22:05 -0500 (Wed, 25 Feb 2009) | 1 line + +[ENH] IMAGE plugin accepts list of images to display. +---------------------------------------------- +r16941 | sylvieg | 2009-02-25 18:02:09 -0500 (Wed, 25 Feb 2009) | 1 line + +[FIX]tracker: textarea can be 1 line height +---------------------------------------------- +r16940 | sylvieg | 2009-02-25 17:02:02 -0500 (Wed, 25 Feb 2009) | 1 line + +[FIX]feature: rollback sefurl in admin->feature (but let also the feature being activated in the sefurl panel) + put multilingual in admin->feature (let the option in admin->i18n too) +---------------------------------------------- +r16939 | pkdille | 2009-02-25 17:00:39 -0500 (Wed, 25 Feb 2009) | 1 line + +[MOD] code indent - no changes +---------------------------------------------- +r16938 | sylvieg | 2009-02-25 15:28:49 -0500 (Wed, 25 Feb 2009) | 1 line + +[MOD]language: to be able like in sumo to have the language in the url path not the url param: en/page will reach tiki-index.php?page=page&switchLang=en - you need to give the list of url params that must be converted to url path (could be also used for workspace with a little code +---------------------------------------------- +r16937 | pkdille | 2009-02-25 15:01:45 -0500 (Wed, 25 Feb 2009) | 1 line + +[MOD] coelesce.css: change td css class "third" which is only used in forums list (tiki-forums.php) for sections. +---------------------------------------------- +r16936 | sewilco | 2009-02-25 13:59:48 -0500 (Wed, 25 Feb 2009) | 1 line + +[ENH] Add fileId so images in filegals can also be used. +---------------------------------------------- +r16932 | marclaporte | 2009-02-25 13:16:25 -0500 (Wed, 25 Feb 2009) | 1 line + +[ENH] 1- Adding some instructions on how to activate php5 via htaccess on some hosts. 2-Better handling and instructions about Apache error handling and use with TikiWiki +---------------------------------------------- +r16931 | chibaguy | 2009-02-25 13:03:49 -0500 (Wed, 25 Feb 2009) | 1 line + +[FIX] Small fixes and improvements in articles. +---------------------------------------------- +r16930 | chibaguy | 2009-02-25 12:47:37 -0500 (Wed, 25 Feb 2009) | 1 line + +[FIX] No need for original author info or url in bundled themes, because they are collaborations. +---------------------------------------------- +r16929 | chibaguy | 2009-02-25 12:18:05 -0500 (Wed, 25 Feb 2009) | 2 lines + +[[ENH] Articles' div.articletrailer (Read more, comments link, icons) improved a little more. + +---------------------------------------------- +r16928 | sewilco | 2009-02-25 11:54:55 -0500 (Wed, 25 Feb 2009) | 1 line + +[BUG] Remove test mode due to high CPU and too much output. +---------------------------------------------- +r16927 | sylvieg | 2009-02-25 11:52:50 -0500 (Wed, 25 Feb 2009) | 1 line + +syntax +---------------------------------------------- +r16926 | sept_7 | 2009-02-25 11:01:17 -0500 (Wed, 25 Feb 2009) | 2 lines + +[FIX] TikiTests : small pb with session and cookie when using current connection + +---------------------------------------------- +r16925 | luciash | 2009-02-25 10:29:21 -0500 (Wed, 25 Feb 2009) | 1 line + +[ENH] enhanced notifications for changed preferences and human readability, ability to translate the preference names and little fixes +---------------------------------------------- +r16922 | marclaporte | 2009-02-25 07:33:09 -0500 (Wed, 25 Feb 2009) | 1 line + +[FIX] Adding defaults for 2 new plugins +---------------------------------------------- +r16921 | pkdille | 2009-02-25 05:30:34 -0500 (Wed, 25 Feb 2009) | 1 line + +[FIX] fix the test that checks if the file is called directly which was bad in the case of files having in their name parts of other file names (e.g: /tiki-user_contacts_prefs.php was unreachable due to prefs.php) +---------------------------------------------- +r16920 | chibaguy | 2009-02-24 23:36:40 -0500 (Tue, 24 Feb 2009) | 1 line + +[ENH] Articles page top improved (placement of background image). +---------------------------------------------- +r16919 | sewilco | 2009-02-24 23:31:14 -0500 (Tue, 24 Feb 2009) | 1 line + +[BUG] Forgot to use ?&opts on URL so it works with simpler .htaccess rules. +---------------------------------------------- +r16918 | sewilco | 2009-02-24 23:26:09 -0500 (Tue, 24 Feb 2009) | 1 line + +[BUG] Change URL/stuff?page=1&opts to URL/stuff1?opts +---------------------------------------------- +r16917 | chibaguy | 2009-02-24 23:02:29 -0500 (Tue, 24 Feb 2009) | 1 line + +[ENH] Articles' div.articletrailer (Read more, comments link, icons) improved. +---------------------------------------------- +r16916 | stojanovim | 2009-02-24 23:00:19 -0500 (Tue, 24 Feb 2009) | 1 line + +- moved php code for determining whether php extensions were loaded or not from the template file (where it didn't work) to the php file +---------------------------------------------- +r16915 | luciash | 2009-02-24 22:50:31 -0500 (Tue, 24 Feb 2009) | 1 line + +[NEW] gender to prefs +---------------------------------------------- +r16914 | stojanovim | 2009-02-24 22:41:43 -0500 (Tue, 24 Feb 2009) | 1 line + +- moved php code for determining whether php extensions were loaded or not from the template file (where it didn't work) to the php file +---------------------------------------------- +r16913 | luciash | 2009-02-24 22:40:39 -0500 (Tue, 24 Feb 2009) | 1 line + +[FIX] tra() +---------------------------------------------- +r16912 | luciash | 2009-02-24 22:38:43 -0500 (Tue, 24 Feb 2009) | 1 line + +[NEW] users can choose to show their gender via user preferences (finally finished and made it optional) which will be displayed in their user profile information and in the mouseover info when enabled +---------------------------------------------- +r16911 | chibaguy | 2009-02-24 21:39:33 -0500 (Tue, 24 Feb 2009) | 1 line + +[FIX] Minor fixes. +---------------------------------------------- +r16910 | chibaguy | 2009-02-24 21:33:30 -0500 (Tue, 24 Feb 2009) | 1 line + +[NEW] Added selectors from tiki-calendar_nav.tpl and minimal properties. +---------------------------------------------- +r16909 | luciash | 2009-02-24 21:13:09 -0500 (Tue, 24 Feb 2009) | 1 line + +[MOD] few fixes to make it work +---------------------------------------------- +r16908 | luciash | 2009-02-24 20:51:26 -0500 (Tue, 24 Feb 2009) | 1 line + +[FIX] PHP notice +---------------------------------------------- +r16907 | luciash | 2009-02-24 20:03:18 -0500 (Tue, 24 Feb 2009) | 1 line + +[SVN] svn:keywords Id +---------------------------------------------- +r16906 | luciash | 2009-02-24 19:54:03 -0500 (Tue, 24 Feb 2009) | 1 line + +[FIX] using stringfix modifier to get correct translatable country name and countryflag to display the flag +---------------------------------------------- +r16905 | luciash | 2009-02-24 19:48:14 -0500 (Tue, 24 Feb 2009) | 1 line + +[FIX] using stringfix modifier to get correct translatable country name +---------------------------------------------- +r16904 | luciash | 2009-02-24 19:45:34 -0500 (Tue, 24 Feb 2009) | 1 line + +[NEW] little smarty modifier to correct troublesome strings +---------------------------------------------- +r16903 | luciash | 2009-02-24 18:42:01 -0500 (Tue, 24 Feb 2009) | 1 line + +[ENH] make country flag names human readable and translatable finally + doxygenation + Id to svn:keywords +---------------------------------------------- +r16902 | luciash | 2009-02-24 18:01:38 -0500 (Tue, 24 Feb 2009) | 1 line + +[FIX] typo + use countryflag smarty modifier +---------------------------------------------- +r16901 | sylvieg | 2009-02-24 17:53:51 -0500 (Tue, 24 Feb 2009) | 1 line + +[MOD]sefurl: move the sefurls setting to a new admin page +---------------------------------------------- +r16900 | pkdille | 2009-02-24 17:52:07 -0500 (Tue, 24 Feb 2009) | 1 line + +[MOD] no changes - indent code +---------------------------------------------- +r16899 | sewilco | 2009-02-24 17:43:39 -0500 (Tue, 24 Feb 2009) | 1 line + +[FIX] Use different ETag for modified image than original image. +---------------------------------------------- +r16898 | sewilco | 2009-02-24 14:22:00 -0500 (Tue, 24 Feb 2009) | 1 line + +[ENH] Remove development code superceded by default+mandatory. +---------------------------------------------- +r16897 | sept_7 | 2009-02-24 14:06:25 -0500 (Tue, 24 Feb 2009) | 2 lines + +[EHN] tiki-filter-base : indentation no change + +---------------------------------------------- +r16896 | alain_desilets | 2009-02-24 13:51:06 -0500 (Tue, 24 Feb 2009) | 1 line + +- In tiki-filter-base, need to change \ to / in pathes, in case we are running on windows. +---------------------------------------------- +r16895 | sylvieg | 2009-02-24 13:48:52 -0500 (Tue, 24 Feb 2009) | 1 line + +[FIX]tracker: more checking on group tracker perms +---------------------------------------------- +r16894 | sewilco | 2009-02-24 13:35:15 -0500 (Tue, 24 Feb 2009) | 1 line + +[ENH] Fix correct size image in modules from IMAGE plugin. +---------------------------------------------- +r16892 | sewilco | 2009-02-24 12:52:00 -0500 (Tue, 24 Feb 2009) | 1 line + +[ENH] default dark border on IMAGE plugin. +---------------------------------------------- +r16890 | sylvieg | 2009-02-24 11:29:57 -0500 (Tue, 24 Feb 2009) | 1 line + +[MOD]tracker: new option 'create a group for each item creation' to allow sharing a private items betwwen a group users +---------------------------------------------- +r16886 | sept_7 | 2009-02-24 09:59:47 -0500 (Tue, 24 Feb 2009) | 2 lines + +[FIX] file galeries : fix thumbnail display... + +---------------------------------------------- +r16884 | pkdille | 2009-02-24 04:09:01 -0500 (Tue, 24 Feb 2009) | 1 line + +[FIX] admin newsletters: param allowtxt (Allow customized text...) is now saved when modifying a newsletter +---------------------------------------------- +r16883 | chibaguy | 2009-02-23 23:21:09 -0500 (Mon, 23 Feb 2009) | 1 line + +[FIX] Improvements for IE6. +---------------------------------------------- +r16882 | chibaguy | 2009-02-23 23:19:10 -0500 (Mon, 23 Feb 2009) | 1 line + +[FIX] Improvements for IE6. +---------------------------------------------- +r16881 | sylvieg | 2009-02-23 13:19:24 -0500 (Mon, 23 Feb 2009) | 1 line + +[FIX]group: the user smarty params was overwrite after a group creation +---------------------------------------------- +r16880 | sewilco | 2009-02-23 13:14:45 -0500 (Mon, 23 Feb 2009) | 1 line + +[ENH] Add blogTitle parameter for blog access by name. +---------------------------------------------- +r16879 | sewilco | 2009-02-23 13:13:31 -0500 (Mon, 23 Feb 2009) | 1 line + +[ENH] Add border and desc (caption) configuration to IMAGE plugin. +---------------------------------------------- +r16877 | campbe13 | 2009-02-23 12:48:15 -0500 (Mon, 23 Feb 2009) | 1 line + +[FIX] rename tiki-testGD.php http://dev.tikiwiki.org/wish1347 +---------------------------------------------- +r16873 | sylvieg | 2009-02-23 11:50:52 -0500 (Mon, 23 Feb 2009) | 1 line + +speeling - as it has been changed in admin trackers +---------------------------------------------- +r16872 | ricks99 | 2009-02-23 11:48:55 -0500 (Mon, 23 Feb 2009) | 1 line + +[ENH]ongoing ui revamp. user change lang and theme prefs moved from admin:login to feature-specific page (lang and look) +---------------------------------------------- +r16871 | jonnybradley | 2009-02-23 11:41:58 -0500 (Mon, 23 Feb 2009) | 1 line + +[NEW] Added fancylist plugin placeholder definitions (no big effect on appearance here, mainly as a reminder that it's a new plugin) +---------------------------------------------- +r16870 | sylvieg | 2009-02-23 11:37:33 -0500 (Mon, 23 Feb 2009) | 1 line + +[FIX]category: admin layout was broken +---------------------------------------------- +r16869 | sylvieg | 2009-02-23 11:25:05 -0500 (Mon, 23 Feb 2009) | 1 line + +indetation no change +---------------------------------------------- +r16867 | sylvieg | 2009-02-23 08:44:58 -0500 (Mon, 23 Feb 2009) | 1 line + +[MOD]tracker: propagate the date type on computed field to be able to have field like this date+2 days +---------------------------------------------- +r16866 | luciash | 2009-02-22 22:20:17 -0500 (Sun, 22 Feb 2009) | 1 line + +[MOD] use the new wiki plugin fancylist to display the steps to get started +---------------------------------------------- +r16865 | luciash | 2009-02-22 22:00:41 -0500 (Sun, 22 Feb 2009) | 1 line + +[NEW] new wiki plugin to display fancy CSS styled lists (currently does ol only) +---------------------------------------------- +r16864 | luciash | 2009-02-22 13:15:37 -0500 (Sun, 22 Feb 2009) | 1 line + +[MOD] no changes - indent code only +---------------------------------------------- +r16863 | sept_7 | 2009-02-22 09:44:06 -0500 (Sun, 22 Feb 2009) | 4 lines + +[ENH] Installer : as requested by Rick99 : select language takes you to the +next installer step, and selected language becomes preferences site_language and +language after DB initialization... + +---------------------------------------------- +r16862 | amette | 2009-02-22 09:21:15 -0500 (Sun, 22 Feb 2009) | 2 lines + +Name 3.0 Betelgeuse + +---------------------------------------------- +r16861 | luciash | 2009-02-22 08:38:03 -0500 (Sun, 22 Feb 2009) | 1 line + +[ENH] strasa theme: nicer look of tabs +---------------------------------------------- +r16860 | marclaporte | 2009-02-22 08:29:20 -0500 (Sun, 22 Feb 2009) | 1 line + +[FIX] Correct theme name +---------------------------------------------- +r16858 | luciash | 2009-02-22 06:00:21 -0500 (Sun, 22 Feb 2009) | 1 line + +[FIX] partial rollback of 16830 changes +---------------------------------------------- +r16857 | chibaguy | 2009-02-22 02:55:21 -0500 (Sun, 22 Feb 2009) | 1 line + +[FIX] Bad mix of old and new CSS menu properties. +---------------------------------------------- +r16856 | sept_7 | 2009-02-21 09:12:56 -0500 (Sat, 21 Feb 2009) | 3 lines + +[ENH] Installer : add language selector + hide superflous messages + We should have the first page of the installer look the same as the others + +---------------------------------------------- +r16855 | pkdille | 2009-02-21 08:30:14 -0500 (Sat, 21 Feb 2009) | 1 line + +[MOD] coelesce theme: some tiny arrangements on freetags +---------------------------------------------- +r16854 | pkdille | 2009-02-21 08:21:06 -0500 (Sat, 21 Feb 2009) | 1 line + +[MOD] no changes - indent code only +---------------------------------------------- +r16853 | pkdille | 2009-02-21 08:06:14 -0500 (Sat, 21 Feb 2009) | 1 line + +[MOD] no changes - indent code only +---------------------------------------------- +r16852 | jonnybradley | 2009-02-20 20:56:30 -0500 (Fri, 20 Feb 2009) | 4 lines + +[FIX]? Changed the box bg colour to a slightly more muted blue, to match the pre-existing (and very nice) roundy corner graphics already there. A more pronounced effect than i expected when replaced globally, so roll-back/fix if you don't like it... but i do :) + + + +---------------------------------------------- +r16850 | sept_7 | 2009-02-20 20:33:05 -0500 (Fri, 20 Feb 2009) | 2 lines + +[FIX] admin panel : fix alignment of some misplaced options... + +---------------------------------------------- +r16849 | sylvieg | 2009-02-20 18:57:04 -0500 (Fri, 20 Feb 2009) | 1 line + +[FIX]darkroom: icons in css menu are defined in default css configuration + some height for vertical css menu +---------------------------------------------- +r16848 | ricks99 | 2009-02-20 16:44:34 -0500 (Fri, 20 Feb 2009) | 1 line + +[ENH]multiple ui changes to better organize. on login tab: moved non-login prefs to general, separated different auth methods into separate tabs, removed user defaults (they are already on user prefs page). visually clarified dependent (parent/child) items. all options now include <LABEL> tags +---------------------------------------------- +r16847 | pkdille | 2009-02-20 15:07:22 -0500 (Fri, 20 Feb 2009) | 1 line + +[MOD] move description in title column in order to homogenize the look with other features +---------------------------------------------- +r16846 | sylvieg | 2009-02-20 15:02:50 -0500 (Fri, 20 Feb 2009) | 1 line + +[MOD]language: when switching language, if best_language is on, activate automatically best_language + not necessary to get the browser language if the user has already selected a language or if switchLang is on +---------------------------------------------- +r16845 | luciash | 2009-02-20 12:24:51 -0500 (Fri, 20 Feb 2009) | 1 line + +[FIX] css menu floated left to wrap nicely +---------------------------------------------- +r16844 | Jyhem | 2009-02-20 11:44:22 -0500 (Fri, 20 Feb 2009) | 1 line + +[FIX] Only show link to tiki-admin.php to tiki_p_admin +---------------------------------------------- +r16843 | ricks99 | 2009-02-20 11:07:22 -0500 (Fri, 20 Feb 2009) | 1 line + +[ENH]new onchange event for droplists. can be used to hide suboptions for items with DISABLED + other options. added to installer (step 6) to hide all https options if DISABLED. +---------------------------------------------- +r16842 | jonnybradley | 2009-02-20 10:11:58 -0500 (Fri, 20 Feb 2009) | 2 lines + +[ENH] Exposing remembermethod option (used to generate hash for rememberme cookie) +New "Simple" method uses unique id instead of IP based value +---------------------------------------------- +r16841 | luciash | 2009-02-20 05:15:26 -0500 (Fri, 20 Feb 2009) | 1 line + +[FIX] made it working + some adjustments +---------------------------------------------- +r16840 | luciash | 2009-02-20 05:03:35 -0500 (Fri, 20 Feb 2009) | 1 line + +[FIX] XHTML code + better tra() +---------------------------------------------- +r16839 | campbe13 | 2009-02-19 17:50:58 -0500 (Thu, 19 Feb 2009) | 1 line + +[FIX] added alt tag to image ref http://dev.tikiwiki.org/wish1347 +---------------------------------------------- +r16838 | campbe13 | 2009-02-19 17:20:49 -0500 (Thu, 19 Feb 2009) | 1 line + +[FIX] newbie error commit +---------------------------------------------- +r16837 | campbe13 | 2009-02-19 17:15:39 -0500 (Thu, 19 Feb 2009) | 1 line + +[FIX] testGD.php add ref: http://dev.tikiwiki.org/wish1347 +---------------------------------------------- +r16836 | campbe13 | 2009-02-19 17:06:14 -0500 (Thu, 19 Feb 2009) | 1 line + +[FIX] GD detected not necessarily working ref: http://dev.tikiwiki.org/wish1347 +---------------------------------------------- +r16835 | pkdille | 2009-02-19 16:01:40 -0500 (Thu, 19 Feb 2009) | 1 line + +[MOD] newsletters: indent code - no changes +---------------------------------------------- +r16834 | jonnybradley | 2009-02-19 13:29:42 -0500 (Thu, 19 Feb 2009) | 1 line + +[FIX] Spellings +---------------------------------------------- +r16833 | sylvieg | 2009-02-19 12:25:35 -0500 (Thu, 19 Feb 2009) | 1 line + +[FIX]tracker: always test on the local perms: TODO: find a better way to test the perms in the tpl +---------------------------------------------- +r16832 | sylvieg | 2009-02-19 11:32:54 -0500 (Thu, 19 Feb 2009) | 1 line + +[FIX]tracker: a tiki_p_admin_trackers can see the users list +---------------------------------------------- +r16831 | luciash | 2009-02-19 09:03:19 -0500 (Thu, 19 Feb 2009) | 1 line + +[DB] synchronization +---------------------------------------------- +r16830 | luciash | 2009-02-19 05:30:31 -0500 (Thu, 19 Feb 2009) | 1 line + +[FIX] nicely aligned cssmenu in FF (TODO: make it for IE too) +---------------------------------------------- +r16829 | chibaguy | 2009-02-19 04:39:58 -0500 (Thu, 19 Feb 2009) | 1 line + +[FIX] CSS menu colors fixed more. +---------------------------------------------- +r16828 | chibaguy | 2009-02-19 03:53:08 -0500 (Thu, 19 Feb 2009) | 1 line + +[FIX] Left-column heading margin corrected; CSS menu colors fixed. +---------------------------------------------- +r16827 | ricks99 | 2009-02-18 18:09:58 -0500 (Wed, 18 Feb 2009) | 1 line + +[ENH]use consistent field names (from registration page), inform users of pw restrictions, show pw strength meter +---------------------------------------------- +r16825 | wggley | 2009-02-18 10:49:17 -0500 (Wed, 18 Feb 2009) | 1 line + +[MOD]tracker: Changing checkbox viewitem to 2 radios(View inserted item and Insert new item) so the user can be redirected to the insert new item page to continue entering items. +---------------------------------------------- +r16824 | ricks99 | 2009-02-18 08:48:07 -0500 (Wed, 18 Feb 2009) | 1 line + +[ENH]UI tweaks. added more help links. css fixes for ie +---------------------------------------------- +r16823 | luciash | 2009-02-17 21:18:59 -0500 (Tue, 17 Feb 2009) | 1 line + +[ENH] commiting the AdminUIRevamp improvements by ricks99 (http://dev.tikiwiki.org/Regrouping+the+General+Admin+page) +---------------------------------------------- +r16822 | luciash | 2009-02-17 20:18:36 -0500 (Tue, 17 Feb 2009) | 1 line + +[ENH] introducing tabs smarty block: propagate everywhere ;) +---------------------------------------------- +r16821 | luciash | 2009-02-17 19:35:42 -0500 (Tue, 17 Feb 2009) | 1 line + +[ENH] introducing tabs smarty block: propagate everywhere ;) +---------------------------------------------- +r16820 | luciash | 2009-02-17 19:23:48 -0500 (Tue, 17 Feb 2009) | 1 line + +[ENH] introducing tabs smarty block: propagate everywhere ;) +---------------------------------------------- +r16819 | luciash | 2009-02-17 19:21:23 -0500 (Tue, 17 Feb 2009) | 1 line + +[NEW] tabs smarty block: easier way of generating tabs in a smarty template TODO: some optional params for class, etc. +---------------------------------------------- +r16818 | luciash | 2009-02-17 18:55:21 -0500 (Tue, 17 Feb 2009) | 2 lines + +[FIX] little fix to tikitabs +[ADD] Id to svn:keywords +---------------------------------------------- +r16817 | luciash | 2009-02-17 16:26:56 -0500 (Tue, 17 Feb 2009) | 1 line + +svn:keywords correct property (must be Id, not "Id") +---------------------------------------------- +r16816 | pkdille | 2009-02-17 16:13:13 -0500 (Tue, 17 Feb 2009) | 1 line + +[MOD] no changes - indent code only +---------------------------------------------- +r16815 | pkdille | 2009-02-17 15:24:36 -0500 (Tue, 17 Feb 2009) | 1 line + +[MOD] list surveys: move description in title column in order to homogenize the look with other features +---------------------------------------------- +r16814 | pkdille | 2009-02-17 15:02:31 -0500 (Tue, 17 Feb 2009) | 1 line + +[MOD] list surveys: no changes - indent code only +---------------------------------------------- +r16813 | pkdille | 2009-02-17 11:47:47 -0500 (Tue, 17 Feb 2009) | 1 line + +[FIX] coelesce: fix width of actions zone in blog +---------------------------------------------- +r16810 | ricks99 | 2009-02-17 07:23:57 -0500 (Tue, 17 Feb 2009) | 1 line + +[MOD]Added new parameter so the antibot-code row in the table will match the style of the rest of the table. +---------------------------------------------- +r16807 | chibaguy | 2009-02-17 05:14:37 -0500 (Tue, 17 Feb 2009) | 1 line + +[ENH] CSS (suckerfish) menu treatment from experimental/ui-revamp. Multiple menus ok as IE6 sfhover js uses class not id and stylesheet selectors aren't specific to any module box; css/cssmenu_horiz.css and css/cssmenu_vert.css are consolidated and updated as css/cssmenus.css for layout but minimal styling. Theme stylesheets contain color properties, etc. Darkroom needs properties sorted out still since it already had some specified. +---------------------------------------------- +r16806 | chibaguy | 2009-02-17 02:53:26 -0500 (Tue, 17 Feb 2009) | 1 line + +[FIX] overflow=y parameter produces inline style="overflow:visible" (missing since 1.9* but handy for CSS menus) +---------------------------------------------- +r16805 | chibaguy | 2009-02-17 01:04:23 -0500 (Tue, 17 Feb 2009) | 1 line + +[FIX] Typo (button background color) +---------------------------------------------- +r16804 | sewilco | 2009-02-16 17:10:45 -0500 (Mon, 16 Feb 2009) | 1 line + +[FIX] Add missing popular m4v video/mpeg MIME type. +---------------------------------------------- +r16803 | sylvieg | 2009-02-16 12:56:10 -0500 (Mon, 16 Feb 2009) | 1 line + +[MOD]group tracker: use all the user groups +---------------------------------------------- +r16802 | sylvieg | 2009-02-16 12:35:43 -0500 (Mon, 16 Feb 2009) | 1 line + +[FIX]group tracker: trackerlist must also filter on group +---------------------------------------------- +r16801 | sylvieg | 2009-02-16 12:04:26 -0500 (Mon, 16 Feb 2009) | 1 line + +[FIX]group tracker: some fix about perms: an item with a group creator field must be visible/editable to each group member +---------------------------------------------- +r16800 | lphuberdeau | 2009-02-16 11:13:42 -0500 (Mon, 16 Feb 2009) | 1 line + +[FIX] Hide initial error when checking for schema presence +---------------------------------------------- +r16798 | jonnybradley | 2009-02-16 10:43:05 -0500 (Mon, 16 Feb 2009) | 1 line + +[FIX] Spellings +---------------------------------------------- +r16797 | lphuberdeau | 2009-02-16 10:37:58 -0500 (Mon, 16 Feb 2009) | 1 line + +[FIX] Missing library +---------------------------------------------- +r16796 | marclaporte | 2009-02-16 10:25:25 -0500 (Mon, 16 Feb 2009) | 1 line + +[FIX] db schema change files need to have _tiki suffix. All existing trunk installs will have this change applied at their next upgrade. +---------------------------------------------- +r16795 | marclaporte | 2009-02-16 10:12:00 -0500 (Mon, 16 Feb 2009) | 1 line + +[ENH] Changing to the new amazing profiles system in the installer. Tks LP. +---------------------------------------------- +r16794 | marclaporte | 2009-02-16 10:08:30 -0500 (Mon, 16 Feb 2009) | 1 line + +[FIX] dos2unix +---------------------------------------------- +r16793 | sylvieg | 2009-02-16 08:24:32 -0500 (Mon, 16 Feb 2009) | 1 line + +[FIX]button: if doing tiki-view_tracker_item.php?view=+user, the trackerId is reconstructed - but {query} considers only the post and get in the url reconstruction. why?. So pas directly the trackerId in the href +---------------------------------------------- +r16791 | obnoxxx | 2009-02-15 20:29:14 -0500 (Sun, 15 Feb 2009) | 3 lines + +[MOD] make the sinc-last-visit-new module only show the new users that +have completed their registration. + +---------------------------------------------- +r16790 | obnoxxx | 2009-02-15 20:27:52 -0500 (Sun, 15 Feb 2009) | 3 lines + +[MOD] make the since-last-visit module only show the users that have +completed the registration by confirming their email. + +---------------------------------------------- +r16789 | obnoxxx | 2009-02-15 20:23:08 -0500 (Sun, 15 Feb 2009) | 5 lines + +[MOD] update registrationDate upon user confirmation + +This allows to distinguish between the creation date (stored in `created`) +and the date of the completed registration. + +---------------------------------------------- +r16788 | obnoxxx | 2009-02-15 19:48:20 -0500 (Sun, 15 Feb 2009) | 2 lines + +[FIX] fix id tag of tiki-information.php to have the proper file name + +---------------------------------------------- +r16787 | obnoxxx | 2009-02-15 19:43:54 -0500 (Sun, 15 Feb 2009) | 2 lines + +[FIX] fix intentation/tabbing of confirm_user() + +---------------------------------------------- +r16786 | sylvieg | 2009-02-15 18:15:09 -0500 (Sun, 15 Feb 2009) | 1 line + +[MOD]comments/forum: take away duplicated code in post topic in forum and post reply in forum and in comments.php itself: 2 new functions post_in_forum to post a topic or a reply and post_in_object to post a comment +---------------------------------------------- +r16785 | sylvieg | 2009-02-15 17:37:55 -0500 (Sun, 15 Feb 2009) | 1 line + +[FIX] good colspan +---------------------------------------------- +r16784 | pkdille | 2009-02-15 15:19:34 -0500 (Sun, 15 Feb 2009) | 1 line + +[MOD] french translation file : get_strings + some translations +---------------------------------------------- +r16783 | marclaporte | 2009-02-15 12:57:54 -0500 (Sun, 15 Feb 2009) | 1 line + +[FIX] Making the password field use stars +---------------------------------------------- +r16782 | marclaporte | 2009-02-15 12:56:13 -0500 (Sun, 15 Feb 2009) | 1 line + +[FIX] dos2unix +---------------------------------------------- +r16781 | matwho | 2009-02-15 11:22:02 -0500 (Sun, 15 Feb 2009) | 1 line + +a test +---------------------------------------------- +r16780 | matwho | 2009-02-15 11:10:37 -0500 (Sun, 15 Feb 2009) | 1 line + +a test +---------------------------------------------- +r16779 | rlopezs | 2009-02-15 11:05:50 -0500 (Sun, 15 Feb 2009) | 1 line + +Rober's first commit.From TikiFest Madrid +---------------------------------------------- +r16778 | axold | 2009-02-15 11:02:52 -0500 (Sun, 15 Feb 2009) | 1 line + +I added a file in test directory +---------------------------------------------- +r16777 | axold | 2009-02-15 11:01:13 -0500 (Sun, 15 Feb 2009) | 1 line + +I added a file in test directory +---------------------------------------------- +r16776 | chibaguy | 2009-02-15 09:56:46 -0500 (Sun, 15 Feb 2009) | 1 line + +[NEW] Implementation of Strasa design by Patrick Allard; initial commit of files. +---------------------------------------------- +r16775 | lphuberdeau | 2009-02-15 09:53:25 -0500 (Sun, 15 Feb 2009) | 1 line + +[FIX] Include path changes broke webservices +---------------------------------------------- +r16774 | sylvieg | 2009-02-15 09:46:45 -0500 (Sun, 15 Feb 2009) | 1 line + +[MOD]contribution: better layout +---------------------------------------------- +r16773 | chibaguy | 2009-02-15 08:06:49 -0500 (Sun, 15 Feb 2009) | 1 line + +[NEW] Coelesce theme design by Patrick Allard for COE ui-revamp; initial commit of files adapted for trunk. +---------------------------------------------- +r16772 | chibaguy | 2009-02-15 07:27:15 -0500 (Sun, 15 Feb 2009) | 1 line + +[FIX] Roll back if necessary, but link class="tableheading" didn't seem to have effect; style provided by "th a". +---------------------------------------------- +r16771 | chibaguy | 2009-02-15 06:30:35 -0500 (Sun, 15 Feb 2009) | 1 line + +[ENH] Blog title changed from div to h1 for uniformity; "breadcrumbs" added; title for tag list. +---------------------------------------------- +r16770 | chibaguy | 2009-02-15 06:25:27 -0500 (Sun, 15 Feb 2009) | 1 line + +[ENH] Layout tables replaced with divs and spans; anchor class changed for uniformity. +---------------------------------------------- +r16769 | pkdille | 2009-02-15 03:18:18 -0500 (Sun, 15 Feb 2009) | 1 line + +[MOD] french translation file : get_strings + some translations +---------------------------------------------- +r16768 | sylvieg | 2009-02-14 18:22:00 -0500 (Sat, 14 Feb 2009) | 1 line + +syntax +---------------------------------------------- +r16767 | sylvieg | 2009-02-14 18:13:13 -0500 (Sat, 14 Feb 2009) | 1 line + +why is the file duplicated? (20081105_calendar_items_allday_tiki.sql) +---------------------------------------------- +r16765 | sylvieg | 2009-02-14 06:04:17 -0500 (Sat, 14 Feb 2009) | 1 line + +syntax +---------------------------------------------- +r16764 | pkdille | 2009-02-14 03:11:15 -0500 (Sat, 14 Feb 2009) | 1 line + +[MOD] french translations : some +---------------------------------------------- +r16763 | chibaguy | 2009-02-14 03:08:02 -0500 (Sat, 14 Feb 2009) | 1 line + +[FIX] Reverted Look and Feel site title variable to previous name (sitetitle) to maintain consistency with existing themes. Case distinguishes it from browser title bar variable (siteTitle). +---------------------------------------------- +r16762 | chibaguy | 2009-02-14 02:42:14 -0500 (Sat, 14 Feb 2009) | 1 line + +[ENH] Replaced the (only) two instances of div class="advanced" with remarksbox type "warning". +---------------------------------------------- +r16761 | marclaporte | 2009-02-13 20:24:12 -0500 (Fri, 13 Feb 2009) | 1 line + +[FIX] Making x -to- y translatable in trackertimeline +---------------------------------------------- +r16760 | sylvieg | 2009-02-13 15:52:55 -0500 (Fri, 13 Feb 2009) | 1 line + +[MOD]poll: from sumo: each poll can have a vote consideration span= last days nb for which statitics are computed + can choose the time span results are displayed + perm to see the poll voters (REPLACE THE FEATURE POLL IS PUBLIC + DISABLE LOCAL VOTERS LIST (as the option was already there - rollback 15708) +---------------------------------------------- +r16759 | sylvieg | 2009-02-13 15:43:44 -0500 (Fri, 13 Feb 2009) | 1 line + +[MOD]poll: from sumo: each poll can have a vote consideration span= last days nb for which statitics are computed + can choose the time span results are displayed + perm to see the poll voters (REPLACE THE FEATURE POLL IS PUBLIC + DISABLE LOCAL VOTERS LIST (as the option was already there - rollback 15708) +---------------------------------------------- +r16758 | ricks99 | 2009-02-13 15:40:13 -0500 (Fri, 13 Feb 2009) | 1 line + +[FIX]typos. installer will now skip general settings for upgrades +---------------------------------------------- +r16757 | ricks99 | 2009-02-13 13:49:48 -0500 (Fri, 13 Feb 2009) | 1 line + +[FIX]add missing labels. done? +---------------------------------------------- +r16756 | ricks99 | 2009-02-13 13:32:15 -0500 (Fri, 13 Feb 2009) | 1 line + +[MOD]Now checks for upgrade and allows user to jump directly to the install/upgrade script page. +---------------------------------------------- +r16755 | ricks99 | 2009-02-13 12:08:57 -0500 (Fri, 13 Feb 2009) | 1 line + +[MOD]tell user if existing db connection found, and allow to keep it or create a new connection. +---------------------------------------------- +r16754 | ricks99 | 2009-02-13 11:49:57 -0500 (Fri, 13 Feb 2009) | 1 line + +[MOD] mail test now optional +---------------------------------------------- +r16753 | ricks99 | 2009-02-13 11:17:28 -0500 (Fri, 13 Feb 2009) | 1 line + +[FIX] validation errors +---------------------------------------------- +r16752 | ricks99 | 2009-02-13 11:05:18 -0500 (Fri, 13 Feb 2009) | 1 line + +[FIX] unclosed div +---------------------------------------------- +r16751 | ricks99 | 2009-02-13 10:12:10 -0500 (Fri, 13 Feb 2009) | 1 line + +[MOD]revamped installer. new ui. installation steps. performs some basic checks. allows for some configuration. +---------------------------------------------- +r16750 | sylvieg | 2009-02-13 04:24:59 -0500 (Fri, 13 Feb 2009) | 1 line + +missing forums_queue update +---------------------------------------------- +r16747 | marclaporte | 2009-02-12 16:24:19 -0500 (Thu, 12 Feb 2009) | 1 line + +[FIX] When viewing tracker items at tiki-view_tracker_item.php, use a translation if available from lang/*/language.php, like it already does in edit mode. +---------------------------------------------- +r16746 | marclaporte | 2009-02-12 16:09:02 -0500 (Thu, 12 Feb 2009) | 1 line + +[ENH] Making trackertimeline categories (left-hand side) use any available translation +---------------------------------------------- +r16743 | marclaporte | 2009-02-12 15:16:46 -0500 (Thu, 12 Feb 2009) | 1 line + +[FIX/MOD] minisidediff setting wasn't working. Removing because in 3.0, diff style is a site-wide setting. The diff is broken as of today in trunk but it has nothing to do with this change. This will give shorter URLs as a bonus. +---------------------------------------------- +r16727 | sylvieg | 2009-02-12 14:27:18 -0500 (Thu, 12 Feb 2009) | 1 line + +[MOD]forum topic: from sumo: anonymous can give email at topic post for notification + fix approval topic post with attachment/anonymous name,mail/tags + take away duplicate code in topic post +---------------------------------------------- +r16726 | luciash | 2009-02-12 12:52:38 -0500 (Thu, 12 Feb 2009) | 1 line + +[FIX] some fixes for non-tab layout (when you copy&paste please don't copy everything but modify accordingly) +---------------------------------------------- +r16725 | luciash | 2009-02-12 12:48:48 -0500 (Thu, 12 Feb 2009) | 1 line + +[ENH] set bg color for highlight +---------------------------------------------- +r16724 | luciash | 2009-02-12 12:22:43 -0500 (Thu, 12 Feb 2009) | 1 line + +[ENH] added help links to the title +---------------------------------------------- +r16723 | luciash | 2009-02-12 11:41:07 -0500 (Thu, 12 Feb 2009) | 1 line + +[MOD] simplification using the label element instead of complicated non-semantic ul list (CSS for those who need it displayed on each row: .findtable label {display: block}) +---------------------------------------------- +r16722 | luciash | 2009-02-12 11:12:14 -0500 (Thu, 12 Feb 2009) | 1 line + +[FIX] XHTML code fix: improperly closed form which is not open if $checkboxes_on are not 'y' +---------------------------------------------- +r16721 | chibaguy | 2009-02-12 10:21:18 -0500 (Thu, 12 Feb 2009) | 1 line + +[FIX] A way is needed to specify site title text for Look and Feel, so to differentiate from the browser title bar variable ($siteTitle), set in admin general, use ($siteheadertitle) in admin Look and Feel. Theme-specific tiki-site_header.tpl files will need updating for the variable name change. +---------------------------------------------- +r16720 | luciash | 2009-02-12 08:33:28 -0500 (Thu, 12 Feb 2009) | 1 line + +[ENH] better look for fieldsets when tabs are off +---------------------------------------------- +r16719 | luciash | 2009-02-12 08:10:38 -0500 (Thu, 12 Feb 2009) | 1 line + +[FIX] vertical-align: middle for inputs +---------------------------------------------- +r16717 | ricks99 | 2009-02-12 07:32:16 -0500 (Thu, 12 Feb 2009) | 1 line + +[FIX]added the missing support for 120x240 and 200x200 ad sizes. +---------------------------------------------- +r16716 | jonnybradley | 2009-02-12 07:19:21 -0500 (Thu, 12 Feb 2009) | 1 line + +[FIX] Show module flip icons (with partial opacity - but not for IE6) so it can be used on iPhone and is more intuitive generally (imho) +---------------------------------------------- +r16715 | jonnybradley | 2009-02-12 07:17:05 -0500 (Thu, 12 Feb 2009) | 1 line + +[ENH] Profile image now more like the other ones - changed unused plugins ones ready for new plugins manager page just so it's different from "plugins aliases" +---------------------------------------------- +r16714 | luciash | 2009-02-12 07:10:16 -0500 (Thu, 12 Feb 2009) | 1 line + +[DEL] no time to maintain and enhance this sub-theme, sorry +---------------------------------------------- +r16713 | jonnybradley | 2009-02-12 07:08:57 -0500 (Thu, 12 Feb 2009) | 1 line + +[FIX] Adding popup_init for overlib (and the Id svn:keyword) +---------------------------------------------- +r16712 | luciash | 2009-02-12 05:04:58 -0500 (Thu, 12 Feb 2009) | 1 line + +[MOD] better matching icon already available for plugins from the Jini iconset +---------------------------------------------- +r16710 | chibaguy | 2009-02-11 22:42:25 -0500 (Wed, 11 Feb 2009) | 1 line + +[FIX] PHPLayers horizontal background image and padding fixed. +---------------------------------------------- +r16709 | lphuberdeau | 2009-02-11 ... [truncated message content] |
From: <sy...@us...> - 2009-03-02 23:54:09
|
Revision: 17102 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17102&view=rev Author: sylvieg Date: 2009-03-02 23:54:00 +0000 (Mon, 02 Mar 2009) Log Message: ----------- [FIX]article: using rating is a function of type , not attached to review type Modified Paths: -------------- branches/3.0/templates/tiki-read_article.tpl branches/3.0/tiki-read_article.php Modified: branches/3.0/templates/tiki-read_article.tpl =================================================================== --- branches/3.0/templates/tiki-read_article.tpl 2009-03-02 23:43:38 UTC (rev 17101) +++ branches/3.0/templates/tiki-read_article.tpl 2009-03-02 23:54:00 UTC (rev 17102) @@ -29,7 +29,7 @@ <br /> </div> - {if $type eq 'Review'} + {if $use_ratings eq 'y'} <div class="articleheading"> {tr}Rating{/tr}: {repeat count=$rating} Modified: branches/3.0/tiki-read_article.php =================================================================== --- branches/3.0/tiki-read_article.php 2009-03-02 23:43:38 UTC (rev 17101) +++ branches/3.0/tiki-read_article.php 2009-03-02 23:54:00 UTC (rev 17102) @@ -98,6 +98,7 @@ $smarty->assign('show_reads', $article_data["show_reads"]); $smarty->assign('size', $article_data["size"]); $smarty->assign('show_size', $article_data["show_size"]); + $smarty->assign('use_ratings', $article_data["use_ratings"]); if (strlen($article_data["image_data"]) > 0) { $smarty->assign('hasImage', 'y'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ny...@us...> - 2009-03-03 06:05:43
|
Revision: 17120 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17120&view=rev Author: nyloth Date: 2009-03-03 06:05:39 +0000 (Tue, 03 Mar 2009) Log Message: ----------- [MOD] installer: only propose profiles installation when tiki can connect to the profiles website Modified Paths: -------------- branches/3.0/installer/tiki-installer.php branches/3.0/templates/tiki-install.tpl Modified: branches/3.0/installer/tiki-installer.php =================================================================== --- branches/3.0/installer/tiki-installer.php 2009-03-03 06:04:28 UTC (rev 17119) +++ branches/3.0/installer/tiki-installer.php 2009-03-03 06:05:39 UTC (rev 17120) @@ -712,10 +712,14 @@ $installer = new Tiki_Profile_Installer; //$installer->setUserData( $data ); // TODO - if ( isset($_REQUEST['profile']) and !empty($_REQUEST['profile']) ) { - $profile = Tiki_Profile::fromNames( 'http://profiles.tikiwiki.org', $_REQUEST['profile'] ); - $installer->install( $profile ); - } + if ( $has_internet_connection && isset($_REQUEST['profile']) and !empty($_REQUEST['profile']) ) { + if ( $_REQUEST['profile'] == 'Small_Organization_Web_Presence' ) { + $profile = $remote_profile_test; + } else { + $profile = Tiki_Profile::fromNames( 'http://profiles.tikiwiki.org', $_REQUEST['profile'] ); + } + $installer->install( $profile ); + } $_SESSION[$cookie_name] = 'admin'; } @@ -782,6 +786,11 @@ $gd_test = 'n'; } $smarty->assign('gd_test', $gd_test); +} elseif ( $install_step == '4' ) { + require_once 'lib/profilelib/profilelib.php'; + $remote_profile_test = Tiki_Profile::fromNames( 'http://profiles.tikiwiki.org', 'Small_Organization_Web_Presence' ); + $has_internet_connection = empty($remote_profile_test) ? 'n' : 'y'; + $smarty->assign('has_internet_connection', $has_internet_connection); } // write general settings Modified: branches/3.0/templates/tiki-install.tpl =================================================================== --- branches/3.0/templates/tiki-install.tpl 2009-03-03 06:04:28 UTC (rev 17119) +++ branches/3.0/templates/tiki-install.tpl 2009-03-03 06:05:39 UTC (rev 17120) @@ -277,13 +277,19 @@ {else} <div id="install-table"> {/if} - {if $tikidb_created}<p style="text-align: center"><img src="img/silk/sticky.png" alt="warning" style="vertical-align:middle"/> <strong>{tr}Warning{/tr}</strong>: {tr}This will destroy your current database{/tr}.</p>{/if} + {if $tikidb_created}<p style="text-align: center"><img src="img/silk/sticky.png" alt="warning" style="vertical-align:middle"/> <strong>{tr}Warning{/tr}</strong>: {tr}This will destroy your current database{/tr}.</p>{/if} + {if $has_internet_connection eq 'y'} <p>{tr}Create a new database (clean install) with profile{/tr}:</p> <select name="profile" size="{if $profiles}{$profiles|@count}{else}5{/if}"> <option value="" selected="selected">Bare-bones default install</option> <option value="Small_Organization_Web_Presence">Small Organization Web Presence</option> </select> <p>{tr}See the documentation for <a target="_blank" href="http://profiles.tikiwiki.org/Profiles_in_30_installer" class="link" title="{tr}Description of available profiles.{/tr}">descriptions of the available profiles{/tr}</a>.</p> + {else} + <p style="text-align: center; color:red">{tr}No Internet Connection has been found.{/tr}</p> + <p style="text-align: center">{tr}The default installation profile will be used.{/tr}</p> + <input type="hidden" name="profile" value="" /> + {/if} <p> </p> <div align="center"> <input type="submit" name="scratch" value=" {tr}Install{/tr} " /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-03 14:05:45
|
Revision: 17136 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17136&view=rev Author: luciash Date: 2009-03-03 14:05:35 +0000 (Tue, 03 Mar 2009) Log Message: ----------- [ENH] pick user avatar: updated description string reflecting the reality (not only gifs are possible) + redirect to prevent resubmit on reload Modified Paths: -------------- branches/3.0/styles/thenews.css branches/3.0/templates/tiki-pick_avatar.tpl branches/3.0/tiki-pick_avatar.php Property Changed: ---------------- branches/3.0/tiki-pick_avatar.php Modified: branches/3.0/styles/thenews.css =================================================================== --- branches/3.0/styles/thenews.css 2009-03-03 13:57:24 UTC (rev 17135) +++ branches/3.0/styles/thenews.css 2009-03-03 14:05:35 UTC (rev 17136) @@ -2380,11 +2380,13 @@ font-size: .9em; overflow: auto !important} -body.tiki_mytiki #tiki-center form {border: 1px solid #aaa} +body.tiki_mytiki #tiki-center form { + border: 1px solid #aaa; + padding: 10px} -body.tiki_mytiki #tiki-center form table.normal { - border: 0; -margin: 10px} +body.tiki_mytiki #tiki-center form table.normal, +body.tiki_mytiki #tiki-center .normal form { + border: none;} /* end of css file */ Modified: branches/3.0/templates/tiki-pick_avatar.tpl =================================================================== --- branches/3.0/templates/tiki-pick_avatar.tpl 2009-03-03 13:57:24 UTC (rev 17135) +++ branches/3.0/templates/tiki-pick_avatar.tpl 2009-03-03 14:05:35 UTC (rev 17136) @@ -1,3 +1,5 @@ +{* $Id$ *} + {title} {if $user ne $userwatch} {tr}Avatar:{/tr} {$userwatch} @@ -17,14 +19,10 @@ {/if} <h2>{if $user eq $userwatch}{tr}Your current avatar{/tr}{else}{tr}Avatar{/tr}{/if}</h2> -<table class="normal"> -<tr> - <td class="formcolor">{if $avatar}{$avatar}{else}{tr}no avatar{/tr}{/if}</td> +{if $avatar}{$avatar}{else}{tr}no avatar{/tr}{/if} {if sizeof($avatars) eq 0 and $avatar} - <td class="formcolor"><a class="link" href="tiki-pick_avatar.php?reset=y" title="{tr}reset{/tr}">{icon _id='cross' alt='{tr}reset{/tr}'}</a></td> +<a class="link" href="tiki-pick_avatar.php?reset=y" title="{tr}reset{/tr}">{icon _id='cross' alt='{tr}reset{/tr}'}</a> {/if} -</tr> -</table> {if sizeof($avatars) > 0} @@ -96,14 +94,15 @@ {/if} -<h2>{tr}Upload your own avatar{/tr}</h2> +<div class="normal"> <form enctype="multipart/form-data" action="tiki-pick_avatar.php" method="post"> +<fieldset> +<legend><strong>{tr}Upload your own avatar{/tr}</strong></legend> {if $user ne $userwatch}<input type="hidden" name="view_user" value="{$userwatch|escape}" />{/if} -<table class="normal"> -<tr><td class="formcolor">{tr}File{/tr} {tr}(Only .gif images, and aproximately 45px x 45px){/tr}:</td><td class="formcolor"> +<label for="userfile1">{tr}File (only .gif, .jpg and .png images approximately 45px × 45px){/tr}:</label> <input type="hidden" name="MAX_FILE_SIZE" value="10000000" /> -<input name="userfile1" type="file" /> -</td></tr> -<tr><td class="formcolor"> </td><td class="formcolor"><input type="submit" name="upload" value="{tr}Upload{/tr}" /></td></tr> -</table> +<input id="userfile1" name="userfile1" type="file" /> +<input class="submitbutton" type="submit" name="upload" value="{tr}Upload{/tr}" /> +</fieldset> </form> +</div> Modified: branches/3.0/tiki-pick_avatar.php =================================================================== --- branches/3.0/tiki-pick_avatar.php 2009-03-03 13:57:24 UTC (rev 17135) +++ branches/3.0/tiki-pick_avatar.php 2009-03-03 14:05:35 UTC (rev 17136) @@ -1,6 +1,6 @@ <?php -// $Id: /cvsroot/tikiwiki/tiki/tiki-pick_avatar.php,v 1.26.2.2 2007-11-23 23:03:46 sylvieg Exp $ +// $Id$ // Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // All Rights Reserved. See copyright.txt for details and a complete list of authors. @@ -107,6 +107,9 @@ $userprefslib->set_user_avatar($userwatch, 'u', '', $name, $size, $type, $data); } } +/* redirect to prevent re-submit on page reload */ + header('Location: tiki-pick_avatar.php'); + exit; } if (isset($_REQUEST["uselib"])) { @@ -128,6 +131,7 @@ } closedir ($h); + $smarty->assign_by_ref('avatars', $avatars); $smarty->assign('numav', count($avatars)); $smarty->assign('yours', rand(0, count($avatars))); @@ -142,4 +146,4 @@ $smarty->assign('mid', 'tiki-pick_avatar.tpl'); $smarty->display("tiki.tpl"); -?> +?> \ No newline at end of file Property changes on: branches/3.0/tiki-pick_avatar.php ___________________________________________________________________ Modified: svn:keywords - "Id" + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Marc L. <ma...@ma...> - 2009-03-03 16:56:06
|
Where is this image stored? Could site logo be managed the same wzy? On 3/3/09, lu...@us... <lu...@us...> wrote: > Revision: 17136 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17136&view=rev > Author: luciash > Date: 2009-03-03 14:05:35 +0000 (Tue, 03 Mar 2009) > > Log Message: > ----------- > [ENH] pick user avatar: updated description string reflecting the reality > (not only gifs are possible) + redirect to prevent resubmit on reload > > Modified Paths: > -------------- > branches/3.0/styles/thenews.css > branches/3.0/templates/tiki-pick_avatar.tpl > branches/3.0/tiki-pick_avatar.php > > Property Changed: > ---------------- > branches/3.0/tiki-pick_avatar.php > > Modified: branches/3.0/styles/thenews.css > =================================================================== > --- branches/3.0/styles/thenews.css 2009-03-03 13:57:24 UTC (rev 17135) > +++ branches/3.0/styles/thenews.css 2009-03-03 14:05:35 UTC (rev 17136) > @@ -2380,11 +2380,13 @@ > font-size: .9em; > overflow: auto !important} > > -body.tiki_mytiki #tiki-center form {border: 1px solid #aaa} > +body.tiki_mytiki #tiki-center form { > + border: 1px solid #aaa; > + padding: 10px} > > -body.tiki_mytiki #tiki-center form table.normal { > - border: 0; > -margin: 10px} > +body.tiki_mytiki #tiki-center form table.normal, > +body.tiki_mytiki #tiki-center .normal form { > + border: none;} > > /* end of css file */ > > > Modified: branches/3.0/templates/tiki-pick_avatar.tpl > =================================================================== > --- branches/3.0/templates/tiki-pick_avatar.tpl 2009-03-03 13:57:24 UTC (rev > 17135) > +++ branches/3.0/templates/tiki-pick_avatar.tpl 2009-03-03 14:05:35 UTC (rev > 17136) > @@ -1,3 +1,5 @@ > +{* $Id$ *} > + > {title} > {if $user ne $userwatch} > {tr}Avatar:{/tr} {$userwatch} > @@ -17,14 +19,10 @@ > {/if} > > <h2>{if $user eq $userwatch}{tr}Your current > avatar{/tr}{else}{tr}Avatar{/tr}{/if}</h2> > -<table class="normal"> > -<tr> > - <td class="formcolor">{if $avatar}{$avatar}{else}{tr}no > avatar{/tr}{/if}</td> > +{if $avatar}{$avatar}{else}{tr}no avatar{/tr}{/if} > {if sizeof($avatars) eq 0 and $avatar} > - <td class="formcolor"><a class="link" href="tiki-pick_avatar.php?reset=y" > title="{tr}reset{/tr}">{icon _id='cross' alt='{tr}reset{/tr}'}</a></td> > +<a class="link" href="tiki-pick_avatar.php?reset=y" > title="{tr}reset{/tr}">{icon _id='cross' alt='{tr}reset{/tr}'}</a> > {/if} > -</tr> > -</table> > > {if sizeof($avatars) > 0} > > @@ -96,14 +94,15 @@ > > {/if} > > -<h2>{tr}Upload your own avatar{/tr}</h2> > +<div class="normal"> > <form enctype="multipart/form-data" action="tiki-pick_avatar.php" > method="post"> > +<fieldset> > +<legend><strong>{tr}Upload your own avatar{/tr}</strong></legend> > {if $user ne $userwatch}<input type="hidden" name="view_user" > value="{$userwatch|escape}" />{/if} > -<table class="normal"> > -<tr><td class="formcolor">{tr}File{/tr} {tr}(Only .gif images, and > aproximately 45px x 45px){/tr}:</td><td class="formcolor"> > +<label for="userfile1">{tr}File (only .gif, .jpg and .png images > approximately 45px × 45px){/tr}:</label> > <input type="hidden" name="MAX_FILE_SIZE" value="10000000" /> > -<input name="userfile1" type="file" /> > -</td></tr> > -<tr><td class="formcolor"> </td><td class="formcolor"><input > type="submit" name="upload" value="{tr}Upload{/tr}" /></td></tr> > -</table> > +<input id="userfile1" name="userfile1" type="file" /> > +<input class="submitbutton" type="submit" name="upload" > value="{tr}Upload{/tr}" /> > +</fieldset> > </form> > +</div> > > Modified: branches/3.0/tiki-pick_avatar.php > =================================================================== > --- branches/3.0/tiki-pick_avatar.php 2009-03-03 13:57:24 UTC (rev 17135) > +++ branches/3.0/tiki-pick_avatar.php 2009-03-03 14:05:35 UTC (rev 17136) > @@ -1,6 +1,6 @@ > <?php > > -// $Id: /cvsroot/tikiwiki/tiki/tiki-pick_avatar.php,v 1.26.2.2 2007-11-23 > 23:03:46 sylvieg Exp $ > +// $Id$ > > // Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, > et. al. > // All Rights Reserved. See copyright.txt for details and a complete list > of authors. > @@ -107,6 +107,9 @@ > $userprefslib->set_user_avatar($userwatch, 'u', '', $name, $size, $type, > $data); > } > } > +/* redirect to prevent re-submit on page reload */ > + header('Location: tiki-pick_avatar.php'); > + exit; > } > > if (isset($_REQUEST["uselib"])) { > @@ -128,6 +131,7 @@ > } > > closedir ($h); > + > $smarty->assign_by_ref('avatars', $avatars); > $smarty->assign('numav', count($avatars)); > $smarty->assign('yours', rand(0, count($avatars))); > @@ -142,4 +146,4 @@ > $smarty->assign('mid', 'tiki-pick_avatar.tpl'); > $smarty->display("tiki.tpl"); > > -?> > +?> > \ No newline at end of file > > > Property changes on: branches/3.0/tiki-pick_avatar.php > ___________________________________________________________________ > Modified: svn:keywords > - "Id" > + Id > > > This was sent by the SourceForge.net collaborative development platform, the > world's largest Open Source development site. > > ------------------------------------------------------------------------------ > Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA > -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise > -Strategies to boost innovation and cut costs with open source participation > -Receive a $600 discount off the registration fee with the source code: SFAD > http://p.sf.net/sfu/XcvMzF8H > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > -- Marc Laporte http://MarcLaporte.com http://TikiWiki.org/MarcLaporte http://AvanTech.net http://OurWiki.net |
From: luci a. l. d' b. <sf...@gr...> - 2009-03-03 20:50:18
|
in database, yes On 03/03/2009 05:56 PM, Marc Laporte wrote: > Where is this image stored? Could site logo be managed the same wzy? > > On 3/3/09, lu...@us... <lu...@us...> wrote: > >> Revision: 17136 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17136&view=rev >> Author: luciash >> Date: 2009-03-03 14:05:35 +0000 (Tue, 03 Mar 2009) >> >> Log Message: >> ----------- >> [ENH] pick user avatar: updated description string reflecting the reality >> (not only gifs are possible) + redirect to prevent resubmit on reload >> >> Modified Paths: >> -------------- >> branches/3.0/styles/thenews.css >> branches/3.0/templates/tiki-pick_avatar.tpl >> branches/3.0/tiki-pick_avatar.php >> >> Property Changed: >> ---------------- >> branches/3.0/tiki-pick_avatar.php >> >> Modified: branches/3.0/styles/thenews.css >> =================================================================== >> --- branches/3.0/styles/thenews.css 2009-03-03 13:57:24 UTC (rev 17135) >> +++ branches/3.0/styles/thenews.css 2009-03-03 14:05:35 UTC (rev 17136) >> @@ -2380,11 +2380,13 @@ >> font-size: .9em; >> overflow: auto !important} >> >> -body.tiki_mytiki #tiki-center form {border: 1px solid #aaa} >> +body.tiki_mytiki #tiki-center form { >> + border: 1px solid #aaa; >> + padding: 10px} >> >> -body.tiki_mytiki #tiki-center form table.normal { >> - border: 0; >> -margin: 10px} >> +body.tiki_mytiki #tiki-center form table.normal, >> +body.tiki_mytiki #tiki-center .normal form { >> + border: none;} >> >> /* end of css file */ >> >> >> Modified: branches/3.0/templates/tiki-pick_avatar.tpl >> =================================================================== >> --- branches/3.0/templates/tiki-pick_avatar.tpl 2009-03-03 13:57:24 UTC (rev >> 17135) >> +++ branches/3.0/templates/tiki-pick_avatar.tpl 2009-03-03 14:05:35 UTC (rev >> 17136) >> @@ -1,3 +1,5 @@ >> +{* $Id$ *} >> + >> {title} >> {if $user ne $userwatch} >> {tr}Avatar:{/tr} {$userwatch} >> @@ -17,14 +19,10 @@ >> {/if} >> >> <h2>{if $user eq $userwatch}{tr}Your current >> avatar{/tr}{else}{tr}Avatar{/tr}{/if}</h2> >> -<table class="normal"> >> -<tr> >> - <td class="formcolor">{if $avatar}{$avatar}{else}{tr}no >> avatar{/tr}{/if}</td> >> +{if $avatar}{$avatar}{else}{tr}no avatar{/tr}{/if} >> {if sizeof($avatars) eq 0 and $avatar} >> - <td class="formcolor"><a class="link" href="tiki-pick_avatar.php?reset=y" >> title="{tr}reset{/tr}">{icon _id='cross' alt='{tr}reset{/tr}'}</a></td> >> +<a class="link" href="tiki-pick_avatar.php?reset=y" >> title="{tr}reset{/tr}">{icon _id='cross' alt='{tr}reset{/tr}'}</a> >> {/if} >> -</tr> >> -</table> >> >> {if sizeof($avatars) > 0} >> >> @@ -96,14 +94,15 @@ >> >> {/if} >> >> -<h2>{tr}Upload your own avatar{/tr}</h2> >> +<div class="normal"> >> <form enctype="multipart/form-data" action="tiki-pick_avatar.php" >> method="post"> >> +<fieldset> >> +<legend><strong>{tr}Upload your own avatar{/tr}</strong></legend> >> {if $user ne $userwatch}<input type="hidden" name="view_user" >> value="{$userwatch|escape}" />{/if} >> -<table class="normal"> >> -<tr><td class="formcolor">{tr}File{/tr} {tr}(Only .gif images, and >> aproximately 45px x 45px){/tr}:</td><td class="formcolor"> >> +<label for="userfile1">{tr}File (only .gif, .jpg and .png images >> approximately 45px × 45px){/tr}:</label> >> <input type="hidden" name="MAX_FILE_SIZE" value="10000000" /> >> -<input name="userfile1" type="file" /> >> -</td></tr> >> -<tr><td class="formcolor"> </td><td class="formcolor"><input >> type="submit" name="upload" value="{tr}Upload{/tr}" /></td></tr> >> -</table> >> +<input id="userfile1" name="userfile1" type="file" /> >> +<input class="submitbutton" type="submit" name="upload" >> value="{tr}Upload{/tr}" /> >> +</fieldset> >> </form> >> +</div> >> >> Modified: branches/3.0/tiki-pick_avatar.php >> =================================================================== >> --- branches/3.0/tiki-pick_avatar.php 2009-03-03 13:57:24 UTC (rev 17135) >> +++ branches/3.0/tiki-pick_avatar.php 2009-03-03 14:05:35 UTC (rev 17136) >> @@ -1,6 +1,6 @@ >> <?php >> >> -// $Id: /cvsroot/tikiwiki/tiki/tiki-pick_avatar.php,v 1.26.2.2 2007-11-23 >> 23:03:46 sylvieg Exp $ >> +// $Id$ >> >> // Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, >> et. al. >> // All Rights Reserved. See copyright.txt for details and a complete list >> of authors. >> @@ -107,6 +107,9 @@ >> $userprefslib->set_user_avatar($userwatch, 'u', '', $name, $size, $type, >> $data); >> } >> } >> +/* redirect to prevent re-submit on page reload */ >> + header('Location: tiki-pick_avatar.php'); >> + exit; >> } >> >> if (isset($_REQUEST["uselib"])) { >> @@ -128,6 +131,7 @@ >> } >> >> closedir ($h); >> + >> $smarty->assign_by_ref('avatars', $avatars); >> $smarty->assign('numav', count($avatars)); >> $smarty->assign('yours', rand(0, count($avatars))); >> @@ -142,4 +146,4 @@ >> $smarty->assign('mid', 'tiki-pick_avatar.tpl'); >> $smarty->display("tiki.tpl"); >> >> -?> >> +?> >> \ No newline at end of file >> >> >> Property changes on: branches/3.0/tiki-pick_avatar.php >> ___________________________________________________________________ >> Modified: svn:keywords >> - "Id" >> + Id >> >> >> This was sent by the SourceForge.net collaborative development platform, the >> world's largest Open Source development site. >> >> ------------------------------------------------------------------------------ >> Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA >> -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise >> -Strategies to boost innovation and cut costs with open source participation >> -Receive a $600 discount off the registration fee with the source code: SFAD >> http://p.sf.net/sfu/XcvMzF8H >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> >> > > > luci -- :. :.: ::: : luciash d' being aka luci alias Lukas Masek graphics and web designer Tikiwiki CMS developer (http://tikiwiki.org) and KDE Wiki admin (http://wiki.kde.org) Feel free to visit my (play)ground at http://ground.cz |
From: <jon...@us...> - 2009-03-03 14:49:35
|
Revision: 17139 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=17139&view=rev Author: jonnybradley Date: 2009-03-03 14:49:25 +0000 (Tue, 03 Mar 2009) Log Message: ----------- [MOD] Put back theme drop-down so it doesn't change the theme without you clicking "apply". It does a post back onchange so you can select theme options. Changed message displayed when drop-down showing theme other than the site theme as it was unclear before (suggestions gratefully recieved!). Moved users change theme below theme option. Would be better if you could preview themes before selecting... TODO Modified Paths: -------------- branches/3.0/templates/tiki-admin-include-look.tpl branches/3.0/tiki-admin_include_look.php Modified: branches/3.0/templates/tiki-admin-include-look.tpl =================================================================== --- branches/3.0/templates/tiki-admin-include-look.tpl 2009-03-03 14:16:16 UTC (rev 17138) +++ branches/3.0/templates/tiki-admin-include-look.tpl 2009-03-03 14:49:25 UTC (rev 17139) @@ -36,36 +36,9 @@ <option value="{$styles[ix]|escape}"{if $a_style eq $styles[ix]} selected="selected"{/if}>{$styles[ix]}</option> {/section} </select> - {if $prefs.site_style != $a_style}<span class="highlight">{tr}* Note: Theme displayed differs from "site" theme ({$prefs.site_style}).{/tr}</span>{/if} + {if $prefs.site_style != $a_style} <span class="highlight">{tr}* Note: theme not saved yet - click "Apply"{/tr}</span>{/if} </td> </tr> - -<tr> - <td class="form">{tr}Reg users can change theme{/tr}:</td> - <td> - <table><tr> - <td style="width: 20px"><input type="checkbox" name="change_theme" {if $prefs.change_theme eq 'y'}checked="checked"{/if}/></td> - <td> - <div id="select_available_styles" {if count($prefs.available_styles) > 0 and $prefs.available_styles[0] ne ''}style="display:none;"{else}style="display:block;"{/if}> - <a class="link" href="javascript:show('available_styles');hide('select_available_styles');">{tr}Restrict available themes{/tr}</a> - </div> - <div id="available_styles" {if count($prefs.available_styles) == 0 or $prefs.available_styles[0] eq ''}style="display:none;"{else}style="display:block;"{/if}> - {tr}Available styles:{/tr}<br /> - <select name="available_styles[]" multiple="multiple" size="5"> - <option value=''>{tr}All{/tr}</option> - {section name=ix loop=$styles} - <option value="{$styles[ix]|escape}" - {if in_array($styles[ix], $prefs.available_styles)}selected="selected"{/if}> - {$styles[ix]} - </option> - {/section} - </select> - </div> - </td> - </tr></table> - </td> - </tr> - <tr> <td class="form" > <label for="general-theme">{tr}Theme options{/tr}:</label> @@ -79,6 +52,31 @@ </select> </td> </tr> + <tr> + <td class="form">{tr}Reg users can change theme{/tr}:</td> + <td> + <table><tr> + <td style="width: 20px"><input type="checkbox" name="change_theme" {if $prefs.change_theme eq 'y'}checked="checked"{/if}/></td> + <td> + <div id="select_available_styles" {if count($prefs.available_styles) > 0 and $prefs.available_styles[0] ne ''}style="display:none;"{else}style="display:block;"{/if}> + <a class="link" href="javascript:show('available_styles');hide('select_available_styles');">{tr}Restrict available themes{/tr}</a> + </div> + <div id="available_styles" {if count($prefs.available_styles) == 0 or $prefs.available_styles[0] eq ''}style="display:none;"{else}style="display:block;"{/if}> + {tr}Available styles:{/tr}<br /> + <select name="available_styles[]" multiple="multiple" size="5"> + <option value=''>{tr}All{/tr}</option> + {section name=ix loop=$styles} + <option value="{$styles[ix]|escape}" + {if in_array($styles[ix], $prefs.available_styles)}selected="selected"{/if}> + {$styles[ix]} + </option> + {/section} + </select> + </div> + </td> + </tr></table> + </td> + </tr> <tr> <td class="form"> <label for="general-slideshows">{tr}Slideshows theme{/tr}:</label> Modified: branches/3.0/tiki-admin_include_look.php =================================================================== --- branches/3.0/tiki-admin_include_look.php 2009-03-03 14:16:16 UTC (rev 17138) +++ branches/3.0/tiki-admin_include_look.php 2009-03-03 14:49:25 UTC (rev 17139) @@ -15,7 +15,7 @@ } $a_style = $prefs['site_style']; -if (isset($_REQUEST["looksetup"]) || (!empty($_REQUEST['site_style']) && $_REQUEST['site_style'] != $prefs['site_style']) ) { +if (isset($_REQUEST["looksetup"])) { ask_ticket('admin-inc-look'); if (isset($_REQUEST["site_style"])) { @@ -150,7 +150,7 @@ $smarty->assign_by_ref("slide_styles", $slide_styles); -if (isset($_REQUEST["site_style"]) || isset($_REQUEST["site_style_option"])) { +if (isset($_REQUEST["looksetup"]) && (isset($_REQUEST["site_style"]) || isset($_REQUEST["site_style_option"]))) { // If the theme has changed, reload the page to use the new theme $location= 'location: tiki-admin.php?page=look'; if ($prefs['feature_tabs'] == 'y') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |