Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[7664] trunk
|
From: <var...@us...> - 2010-08-31 15:43:06
|
Revision: 7664
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7664&view=rev
Author: vargenau
Date: 2010-08-31 15:42:34 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
Rename from gforge to fusionforge
Modified Paths:
--------------
trunk/TODO
trunk/config/config-dist.ini
trunk/configurator.php
trunk/doc/CREDITS
trunk/g
trunk/lib/CachedMarkup.php
trunk/lib/WikiUserNew.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/upgrade.php
trunk/pgsrc/ReleaseNotes
trunk/themes/Makefile
trunk/themes/Makefile.global
trunk/themes/fusionforge/wikilens-min.js
trunk/themes/fusionforge/wikilens.js
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/TODO 2010-08-31 15:42:34 UTC (rev 7664)
@@ -11,7 +11,6 @@
** in MonoBook, IEFixes.js cannot be minimized, yuicompressor-2.4.2 gives syntax errors
* plugin Video does not work
-
short-term TODO:
* rename should check existing subpages and rename these also.
* Sidebar: merge AVL theme (internal MonoBook derivate with customizable
@@ -161,7 +160,7 @@
* change remove_page in WikiDb API, so that RecentChanges displays it.
(just purge all revisions?)
- * rename global $Theme to $WikiTheme (gforge nameclash) (100%)
+ * rename global $Theme to $WikiTheme (Gforge nameclash) (100%)
1.4.0 Goals:
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/config/config-dist.ini 2010-08-31 15:42:34 UTC (rev 7664)
@@ -626,7 +626,8 @@
; LDAP: Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN
; IMAP: Authenticate against IMAP_AUTH_HOST (email account)
; POP3: Authenticate against POP3_AUTH_HOST (email account)
-; Session: Get username and level from a PHP session variable. (e.g. for gforge)
+; Session: Get username and level from a PHP session variable
+; (e.g. for FusionForge)
; File: Store username:crypted-passwords in .htaccess like files.
; Use Apache's htpasswd to manage this file.
; HttpAuth: Use the protection by the webserver (.htaccess/.htpasswd)
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/configurator.php 2010-08-31 15:42:34 UTC (rev 7664)
@@ -889,7 +889,7 @@
<dt>POP3</dt>
<dd>Authenticate against POP3_AUTH_HOST (email account)</dd>
<dt>Session</dt>
- <dd>Get username and level from a PHP session variable. (e.g. for gforge)</dd>
+ <dd>Get username and level from a PHP session variable. (e.g. for FusionForge)</dd>
<dt>File</dt>
<dd>Store username:crypted-passwords in .htaccess like files.
Use Apache's htpasswd to manage this file.</dd>
Modified: trunk/doc/CREDITS
===================================================================
--- trunk/doc/CREDITS 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/doc/CREDITS 2010-08-31 15:42:34 UTC (rev 7664)
@@ -23,8 +23,8 @@
! Developers
;[ Marc-Etienne Vargenau | mailto:var...@us... ] :
-;: Chief of gforge integration, WikiCreole integration,
-;: html conformity, documentation, ...
+;: Chief of FusionForge integration, WikiCreole integration,
+;: HTML conformity, documentation, ...
;Sabri Labbenes
;: Wikiwyg
@@ -217,7 +217,7 @@
Michael Heilemann (Kubrick css)
Gabriel Wicke (MonoBook layout, CSS and js)
Chris Snyder (RawHtml safe mode)
-Martin Langhoff <ma...@ca...> (gforge integration)
+Martin Langhoff <ma...@ca...> (Gforge integration)
Ry4an Brase (IRC gateway)
Sara von Mosch (Word to wiki converter)
</pre>
Modified: trunk/g
===================================================================
--- trunk/g 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/g 2010-08-31 15:42:34 UTC (rev 7664)
@@ -66,14 +66,14 @@
define('VIRTUAL_PATH', '/wiki/g/'.$group_name);
define('PAGE_PREFIX', '_g'.$group_id.'_');
- define('THEME', 'gforge');
+ define('THEME', 'fusionforge');
// For Gforge, we create some specific pages, located in the theme
// except for project "help"
if ($group_name == "help") {
define('WIKI_PGSRC', 'pgsrc');
} else {
- define('WIKI_PGSRC', 'themes/gforge/pgsrc');
+ define('WIKI_PGSRC', 'themes/fusionforge/pgsrc');
}
define('FUSIONFORGE', true);
@@ -102,7 +102,7 @@
// Get the maximum upload filesize from PHP config
define('MAX_UPLOAD_SIZE', octets(ini_get('upload_max_filesize')));
- // Disable access log (already in apache & gforge).
+ // Disable access log (already in Apache & FusionForge).
define('ACCESS_LOG_SQL', 0);
define('DEBUG', ($sys_install_type != 'production'));
@@ -171,7 +171,7 @@
$LANG='en'; $LC_ALL='en_US';
// We use a local interwiki map file
- define('INTERWIKI_MAP_FILE', 'themes/gforge/interwiki.map');
+ define('INTERWIKI_MAP_FILE', 'themes/fusionforge/interwiki.map');
define('DEFAULT_WIKI_PAGES', "");
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/CachedMarkup.php 2010-08-31 15:42:34 UTC (rev 7664)
@@ -37,13 +37,13 @@
function pack() {
- // Gforge hack
+ // FusionForge hack
// This causes a strange bug when a comment containing
// a single quote is entered in the Summary box:
// - the history is wrong (user and comment missing)
// - the table of contents plugin no longer works
global $WikiTheme;
- if (isa($WikiTheme, 'WikiTheme_gforge')) {
+ if (isa($WikiTheme, 'WikiTheme_fusionforge')) {
return serialize($this);
}
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/WikiUserNew.php 2010-08-31 15:42:34 UTC (rev 7664)
@@ -1984,7 +1984,7 @@
// This should be probably be done with $customUserPreferenceColumns
// For now, we use FUSIONFORGE define
if (FUSIONFORGE) {
- $gforgeprefs = array(
+ $fusionforgeprefs = array(
'pageTrail' => new _UserPreference_bool(),
'diffMenuItem' => new _UserPreference_bool(),
'pageInfoMenuItem' => new _UserPreference_bool(),
@@ -2002,7 +2002,7 @@
'likePagesMenuItem' => new _UserPreference_bool(),
'specialPagesMenuItem' => new _UserPreference_bool(),
);
- $this->_prefs = array_merge($this->_prefs, $gforgeprefs);
+ $this->_prefs = array_merge($this->_prefs, $fusionforgeprefs);
}
// add custom theme-specific pref types:
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/loadsave.php 2010-08-31 15:42:34 UTC (rev 7664)
@@ -113,7 +113,7 @@
PrintXML(HTML::p(HTML::strong(_("Complete."))),
HTML::p(fmt("Return to %s", $pagelink)));
// Ugly hack to get valid XHTML code
- if (isa($WikiTheme, 'WikiTheme_gforge')) {
+ if (isa($WikiTheme, 'WikiTheme_fusionforge')) {
echo "</div>\n";
echo "</td></tr>\n";
echo "</table>\n";
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/main.php 2010-08-31 15:42:34 UTC (rev 7664)
@@ -115,7 +115,7 @@
if (isset($this->_user) and
( ! isa($this->_user, WikiUserClassname())
or (strtolower(get_class($this->_user)) == '_passuser')
- or (strtolower(get_class($this->_user)) == '_gforgepassuser')))
+ or (strtolower(get_class($this->_user)) == '_fusionforgepassuser')))
{
$this->_user = WikiUser($userid, $this->_user->_prefs);
}
Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/plugin/RecentChanges.php 2010-08-31 15:42:34 UTC (rev 7664)
@@ -494,7 +494,7 @@
$linkorname = $this->pageLink($rev);
}
- if ((isa($WikiTheme, 'WikiTheme_MonoBook')) or (isa($WikiTheme, 'WikiTheme_gforge'))) {
+ if ((isa($WikiTheme, 'WikiTheme_MonoBook')) or (isa($WikiTheme, 'WikiTheme_fusionforge'))) {
$line->pushContent(
$args['historylinks'] ? '' : $this->historyLink($rev),
' . . ', $linkorname, '; ',
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/upgrade.php 2010-08-31 15:42:34 UTC (rev 7664)
@@ -146,7 +146,7 @@
// see loadsave.php for saving new pages.
function CheckPgsrcUpdate() {
- // Check some theme specific pgsrc files (blog, wikilens, gforge, custom).
+ // Check some theme specific pgsrc files (blog, wikilens, fusionforge, custom).
// We check theme specific pgsrc first in case the page is present in both
// theme specific and global pgsrc
global $WikiTheme;
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/pgsrc/ReleaseNotes 2010-08-31 15:42:34 UTC (rev 7664)
@@ -25,8 +25,8 @@
Improved dumping, pageset handling for format= with ~ActionPages.
e.g. dump pagesets or multi-page pdf's.
-The Sidebar theme is now an extension of the Monobook theme (known from wikipedia),
-the new gforge theme is to be used together with gforge (the successor of Sourceforge).
+The Sidebar theme is now an extension of the Monobook theme (known from Wikipedia),
+the new fusionforge theme is to be used together with FusionForge (the successor of Gforge).
=== Fixes ===
* fix ~PagePerm for multiple groups: not a member and undecided: check other groups
Modified: trunk/themes/Makefile
===================================================================
--- trunk/themes/Makefile 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/themes/Makefile 2010-08-31 15:42:34 UTC (rev 7664)
@@ -7,7 +7,7 @@
.PHONY: all css js
-THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX gforge \
+THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX fusionforge \
Portland shamino_com Crao Wordpress smaller Hawaiian
# http://developer.yahoo.com/yui/compressor/
Modified: trunk/themes/Makefile.global
===================================================================
--- trunk/themes/Makefile.global 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/themes/Makefile.global 2010-08-31 15:42:34 UTC (rev 7664)
@@ -6,7 +6,7 @@
.PHONY: all css js
-THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX gforge
+THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX fusionforge
# http://developer.yahoo.com/yui/compressor/
YUICOMPRESSOR = java -jar ../default/yuicompressor-2.4.2.jar
Modified: trunk/themes/fusionforge/wikilens-min.js
===================================================================
--- trunk/themes/fusionforge/wikilens-min.js 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/themes/fusionforge/wikilens-min.js 2010-08-31 15:42:34 UTC (rev 7664)
@@ -1 +1 @@
-var rating=new Array;var prediction=new Array;var avg=new Array;var numusers=new Array;var canRate=new Array;var msg_rating_votes="Rating: %.1f (%d votes)";var msg_curr_rating="Your current rating: ";var msg_curr_prediction="Your current prediction: ";var msg_to=" to ";var msg_add_rating="Add your rating: ";var msg_thanks="Thanks!";var msg_rating_deleted="Rating deleted!";var rateit_imgsrc="/plugins/wiki/themes/gforge/images/RateIt";var rateit_action="RateIt";var idTop="";function displayRating(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(canRate[a]){if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(g<=(k*2)){e="O"}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function displayRating2(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(k<=n){if(g<=(k*2)){e="Rp"}else{if(g<=(n*2)){e="R"}}}else{if(g<=(n*2)){e="Rp"}else{if(g<=(k*2)){e="Rm"}}}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function sprintfRating(b,a,c){var d=Math.round(a*10)/10;if(c<2){b=b.replace(/votes/,"vote")}return b.replace(/\%.1f/,d).replace(/\%d/,c)}function clickRating(c,f,i,a,e,g){var h=a+"Action";var j=document.getElementById("rateit-widget-top");var k=numusers[a];var b=rating[a];if(g=="X"){deleteRating(h,f,e);if(j&&k){var d=avg[a]*k;var l;if(b&&b>0){if(k>1){l=(d-b)/(k-1);numusers[a]--}else{l=0;numusers[a]=0}}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,k-1)}}rating[a]=0;displayRating2(a,c,0,0,1)}else{submitRating(h,f,i,e,g);if(j&&k){var d=avg[a]*k;var l;if(b&&(b>0)){l=(d+g-b)/k}else{l=(d+g)/(k+1);numusers[a]++}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;if(g!=rating[a]){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,numusers[a])}}}else{if(j&&idTop==a){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,g,1);avg[a]=g;numusers[a]=1}}rating[a]=g;displayRating2(a,c,g,0,1)}}function submitRating(d,e,a,f,g){var c=Math.round(Math.random()*(1000000));var b=WikiURL(e)+"version="+a+"&action="+rateit_action+"&mode=add&rating="+g+"&dimension="+f+"&nocache=1&nopurge=1&rand="+c;document[d].title=msg_thanks;document[d].src=b}function deleteRating(c,d,e){var b=Math.round(Math.random()*(1000000));var a=WikiURL(d)+"action="+rateit_action+"&mode=delete&dimension="+e+"&nocache=1&nopurge=1&rand="+b;document[c].title=msg_rating_deleted;document[c].src=a};
\ No newline at end of file
+var rating=new Array;var prediction=new Array;var avg=new Array;var numusers=new Array;var canRate=new Array;var msg_rating_votes="Rating: %.1f (%d votes)";var msg_curr_rating="Your current rating: ";var msg_curr_prediction="Your current prediction: ";var msg_to=" to ";var msg_add_rating="Add your rating: ";var msg_thanks="Thanks!";var msg_rating_deleted="Rating deleted!";var rateit_imgsrc="/plugins/wiki/themes/fusionforge/images/RateIt";var rateit_action="RateIt";var idTop="";function displayRating(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(canRate[a]){if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(g<=(k*2)){e="O"}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function displayRating2(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(k<=n){if(g<=(k*2)){e="Rp"}else{if(g<=(n*2)){e="R"}}}else{if(g<=(n*2)){e="Rp"}else{if(g<=(k*2)){e="Rm"}}}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function sprintfRating(b,a,c){var d=Math.round(a*10)/10;if(c<2){b=b.replace(/votes/,"vote")}return b.replace(/\%.1f/,d).replace(/\%d/,c)}function clickRating(c,f,i,a,e,g){var h=a+"Action";var j=document.getElementById("rateit-widget-top");var k=numusers[a];var b=rating[a];if(g=="X"){deleteRating(h,f,e);if(j&&k){var d=avg[a]*k;var l;if(b&&b>0){if(k>1){l=(d-b)/(k-1);numusers[a]--}else{l=0;numusers[a]=0}}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,k-1)}}rating[a]=0;displayRating2(a,c,0,0,1)}else{submitRating(h,f,i,e,g);if(j&&k){var d=avg[a]*k;var l;if(b&&(b>0)){l=(d+g-b)/k}else{l=(d+g)/(k+1);numusers[a]++}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;if(g!=rating[a]){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,numusers[a])}}}else{if(j&&idTop==a){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,g,1);avg[a]=g;numusers[a]=1}}rating[a]=g;displayRating2(a,c,g,0,1)}}function submitRating(d,e,a,f,g){var c=Math.round(Math.random()*(1000000));var b=WikiURL(e)+"version="+a+"&action="+rateit_action+"&mode=add&rating="+g+"&dimension="+f+"&nocache=1&nopurge=1&rand="+c;document[d].title=msg_thanks;document[d].src=b}function deleteRating(c,d,e){var b=Math.round(Math.random()*(1000000));var a=WikiURL(d)+"action="+rateit_action+"&mode=delete&dimension="+e+"&nocache=1&nopurge=1&rand="+b;document[c].title=msg_rating_deleted;document[c].src=a};
\ No newline at end of file
Modified: trunk/themes/fusionforge/wikilens.js
===================================================================
--- trunk/themes/fusionforge/wikilens.js 2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/themes/fusionforge/wikilens.js 2010-08-31 15:42:34 UTC (rev 7664)
@@ -23,7 +23,7 @@
var msg_rating_deleted = "Rating deleted!";
//var rateit_imgsrc = '/phpwiki-cvs/themes/MonoBook/images/RateIt';
-var rateit_imgsrc = '/plugins/wiki/themes/gforge/images/RateIt';
+var rateit_imgsrc = '/plugins/wiki/themes/fusionforge/images/RateIt';
var rateit_action = 'RateIt';
var idTop = '';
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|