Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1028 - in qa/forge/portal-extensions: forge-forums/scripts forge-theme/jbossForgeLayout.war forge-theme/jbossForgeLayout.war/elqNow forge-theme/jbossForgeLayout.war/layouts
Author: dam...@jb... Date: 2005-08-31 13:06:41 -0400 (Wed, 31 Aug 2005) New Revision: 1028 Added: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/ qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js Removed: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js Modified: qa/forge/portal-extensions/forge-forums/scripts/all.sql qa/forge/portal-extensions/forge-forums/scripts/conv.sql qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp Log: MERGED: -r 1010:1027 https://svn.labs.jboss.com/trunk/forge into qa/forge. This adds the Eloqua tracking in Labs. Modified: qa/forge/portal-extensions/forge-forums/scripts/all.sql =================================================================== --- qa/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-31 16:26:13 UTC (rev 1027) +++ qa/forge/portal-extensions/forge-forums/scripts/all.sql 2005-08-31 17:06:41 UTC (rev 1028) @@ -6,8 +6,5 @@ \. portal-keys.sql -- AFTER ADDING THE KEYS: UPDATING POST COUNT - --- ANY IDEAS WHY THIS ISN'T WORKING? ---UPDATE jbp_forums_posters posters SET posters.jbp_post_count = 10; ---- (SELECT COUNT(posts.jbp_id) FROM jbp_forums_posts posts WHERE --- posts.jbp_poster_id = posters.jbp_id); +-- UPDATE jbp_forums_posters posters SET posters.jbp_post_count = (SELECT COUNT(posts.jbp_id) +-- FROM jbp_forums_posts posts WHERE posts.jbp_poster_id = posters.jbp_id); Modified: qa/forge/portal-extensions/forge-forums/scripts/conv.sql =================================================================== --- qa/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-31 16:26:13 UTC (rev 1027) +++ qa/forge/portal-extensions/forge-forums/scripts/conv.sql 2005-08-31 17:06:41 UTC (rev 1028) @@ -1,11 +1,5 @@ -- DB CONVERT SCRIPT OF NUKES3 FORUMS TO PORTAL FORUMS W/ USERS TABLE --- Converting categories ---ALTER TABLE phpbb_categories RENAME TO jbp_forums_categories; ---ALTER TABLE jbp_forums_categories CHANGE cat_id jbp_id int(11) NOT NULL auto_increment, ADD PRIMARY KEY (jbp_id); ---ALTER TABLE jbp_forums_categories CHANGE cat_title jbp_title varchar(255) default NULL; ---ALTER TABLE jbp_forums_categories CHANGE cat_order jbp_order int(11) default NULL; - -- Copying data from users (into users and posters). -- To make things easy, we assume that poster id == user id. This makes this -- script useable only for making a completely new portal db, not merging it @@ -38,7 +32,7 @@ n.forum_status, 0 FROM phpbb_forums n; -- Portal doesn't like "null" here. -UPDATE jbp_forums_forums SET jbp_prune_next=0 WHERE jbp_prune_next = NULL; +UPDATE jbp_forums_forums SET jbp_prune_next=0 WHERE jbp_prune_next IS NULL; -- Copying data from forumswatch - two tables required here. -- First inserting user+mode data. Copied: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow (from rev 1027, trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow) Deleted: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js =================================================================== --- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js 2005-08-31 16:26:13 UTC (rev 1027) +++ qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js 2005-08-31 17:06:41 UTC (rev 1028) @@ -1,56 +0,0 @@ -//------------------------------------------------------ -// Copyright Eloqua Corporation. -// -var elqSiteID = '257'; -var elqVer = 'v200'; -// -var elqERoot = 'now.eloqua.com/'; -var elqSecERoot = 'secure.eloqua.com/'; -// -//------------------------------------------------------ -function elqErr(){return true;} -window.onerror = elqErr; -var elqCurESite = '', elqAltESite = '', elqWCount = 0, elqTryI = false; -var elqStr = '', elqTID = null, elqTRun = false, elqLoad = false, elqFail = false; -if (location.protocol == 'https:') { elqCurESite = 'https://' + elqSecERoot; elqAltESite = 'http://' + elqERoot;} -else { elqCurESite = 'http://' + elqERoot; elqAltESite = 'https://' + elqSecERoot;} -var elqCurE = elqCurESite + 'visitor/' + elqVer + '/svrGP.asp'; -if (navigator.appVersion.indexOf('Macintosh') == -1) { - if ((navigator.appName == 'Netscape') && (parseInt(navigator.appVersion) > 4)) { elqTryI = true; } - if (((navigator.appName == 'Microsoft Internet Explorer') || (navigator.userAgent.indexOf('AOL') != -1)) && (navigator.appVersion.indexOf('3.0') == -1)) { elqTryI = true; }} -function elqClearT() { if(elqTRun) { clearTimeout(elqTID); elqTID = null; elqTRun = false;}} -function elqWrite() { - if ((elqWCount > 75) || elqFail) { elqClearT(); } - else { elqWCount++; - if (!elqLoad) { elqTRun = true; elqTID = setTimeout('elqInit();', 1000);} - else { elqClearT(); if (!elqFail) {document.write(elqStr); }}}} -function elqInit(){ elqClearT(); elqWrite();} -function elqReplace(string,text,by) { - var strLength = string.length, txtLength = text.length; - if ((strLength == 0) || (txtLength == 0)) return string; - var i = string.indexOf(text); - if ((!i) && (text != string.substring(0,txtLength))) return string; - if (i == -1) return string; - var newstr = string.substring(0,i) + by; - if (i+txtLength < strLength) - newstr += elqReplace(string.substring(i+txtLength,strLength),text,by); - return newstr; } -function elqQString(strVariable, strDefault, intUnencode) { - var strSearchString = strVariable.toLowerCase() + '='; - var strQString = location.search + '&'; - var strQStringLower = strQString.toLowerCase(); - var intStart = strQStringLower.indexOf(strSearchString); - if (intStart != -1) { - strQString = strQString.substring(intStart); - strQString = strQString ? strQString.substring(strQString.indexOf('=') + 1, strQString.indexOf('&')) : '';} - if ((intStart == -1) || (strQString == '')) { strQString = strDefault;} - if (intUnencode == 1) { strQString = elqReplace(strQString,'%26','&');} - else if (intUnencode == 2) { strQString = elqReplace(elqReplace(strQString,'%26','&'),'%23','#');} - return strQString;} -function elqAddQS(strURL, strAdd) { - if ((strAdd == '') || (strURL == '')) {return strURL;} - var intP = strURL.indexOf('?'); - var intH = (strURL.indexOf('#') != -1) ? strURL.indexOf('#') : strURL.length; - if (intP == -1) {return (strURL.substring(0,intH) + '?' + strAdd + strURL.substring(intH,strURL.length));} - if (intP == strURL.length - 1) { return (strURL + strAdd);} - return (strURL.substring(0,intP+1) + strAdd + '&' + strURL.substring(intP+1,strURL.length));} \ No newline at end of file Copied: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js (from rev 1027, trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqCfg.js) Deleted: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js =================================================================== --- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js 2005-08-31 16:26:13 UTC (rev 1027) +++ qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js 2005-08-31 17:06:41 UTC (rev 1028) @@ -1,13 +0,0 @@ -// Copyright Eloqua Corporation. -var elqWDt = new Date(20020101); -var elqDt = new Date(); -var elqMs = elqDt.getMilliseconds(); -var elqTzo = elqWDt.getTimezoneOffset(); -var elqRef2 = ''; -if (typeof elqCurE != 'undefined'){ -if (document.referrer) { elqRef2 = document.referrer; } -if ((typeof elqRef2 == 'undefined') || (elqRef2 == 'undefined') || (elqRef2 == '')) { elqRef2 = 'elqNone'; } -else { elqRef2 = elqReplace(elqReplace(elqRef2,'&','%26'),'#','%23'); } -if (navigator.appName == 'Netscape') { document.write('<la' + 'yer hidden=true><im' + 'g src="' + elqCurE + '?pps=3&siteid=' + elqSiteID + '&ref2=' + elqRef2 + '&tzo=' + elqTzo + '&ms=' + elqMs + '" border=0 width=1 height=1 ><\/la' + 'yer>');} -else { document.write('<im' + 'g style="display:none" src="' + elqCurE + '?pps=3&siteid=' + elqSiteID + '&ref2=' + elqRef2 + '&tzo=' + elqTzo + '&ms=' + elqMs + '" border=0 width=1 height=1 >');} -} Copied: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js (from rev 1027, trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/elqNow/elqImg.js) Modified: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp =================================================================== --- qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2005-08-31 16:26:13 UTC (rev 1027) +++ qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2005-08-31 17:06:41 UTC (rev 1028) @@ -1,91 +1,97 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> -<html xmlns="http://www.w3.org/1999/xhtml"> -<!-- - JBoss, the OpenSource J2EE webOS - Distributable under LGPL license. - See terms of license at gnu.org. - --> -<head><title>JBoss Labs</title> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> -<!-- changed to local CSS for now - -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/screen.css" type="text/css" media="screen"> -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/print.css" type="text/css" media="print"> -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/common.css" type="text/css" media="all"> - --> -<link rel="stylesheet" href="/jbossForge/screen.css" type="text/css" media="screen"> -<link rel="stylesheet" href="/jbossForge/print.css" type="text/css" media="print"> -<link rel="stylesheet" href="/jbossForge/common.css" type="text/css" media="all"> -<link rel="stylesheet" href="/jbossForge/jboss-forge.css" type="text/css" media="all"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<html xmlns="http://www.w3.org/1999/xhtml"> +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<head><title>JBoss Labs</title> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> +<!-- changed to local CSS for now + +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/screen.css" type="text/css" media="screen"> +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/print.css" type="text/css" media="print"> +<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/common.css" type="text/css" media="all"> + --> +<link rel="stylesheet" href="/jbossForge/screen.css" type="text/css" media="screen"> +<link rel="stylesheet" href="/jbossForge/print.css" type="text/css" media="print"> +<link rel="stylesheet" href="/jbossForge/common.css" type="text/css" media="all"> +<link rel="stylesheet" href="/jbossForge/jboss-forge.css" type="text/css" media="all"> <link rel="stylesheet" href="/jbossForge/jboss-forge-forums.css" type="text/css" media="all"> -<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> - <!-- <p:theme themeName='jboss-forge' /> --> - -</head> - -<body> -<!-- HEADER START --> -<!-- this image creates IE problems --> -<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> - -<div class="brand_FED" id="container"> - -<div id="TopLogo"> - <img src="/jbossForge/images/logo.gif" alt="JBoss - The Professional Open Source Company"> -</div> -<div id="TopMenu"> - <table cellpadding="0" cellspacing="0"> - <tbody><tr> - <td class="menu_JBnetwork"><a href="http://network.jboss.com/">JBoss Network</a></td> - <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">JEMS Products</a></td> - <td class="menu_JBcom"><a href="http://www.jboss.com/index">JBoss.com</a></td> - <td class="menu_JBfed"><a href="http://www.jboss.com/federation/index">JBoss Federation</a></td> - </tr> - </tbody></table> -</div> -<div id="ControlMenu"> - <form id="TopSearch" action="http://www.jboss.com/search.jsp"> - <ul> - <li><a href="/portal/authsec">Login</a></li> - <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> - <li><a href="http://www.jboss.com/careers">Careers</a></li> - <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> - <li> - <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="query" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> - <input class="searchbutton" type="image" src="/jbossForge/images/spacer.gif" value="go" align="middle" /> - </li> - </ul> - </form> - -</div> -<!-- HEADER END --> - -<!-- main page table --> -<table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> -<tbody><tr> - <td colspan="2" class="topheader"></td> - </tr> - <tr> - <td class="leftside"><p:region regionName='left'/></td> - <td class="bodycell"><p:region regionName='center'/></td> - - -</tr> -</tbody></table> - -<div id="jbfPageFooter"> - <div id="Copyright"> - JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br> -Theme made by <a href="http://mamut.net.pl">Szimano</a> - </div> -</div> - - - -</body> -</html> - - - - +<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> + <!-- <p:theme themeName='jboss-forge' /> --> + + +<SCRIPT TYPE='text/javascript' LANGUAGE='JavaScript' +SRC='jbossForge/elqNow/elqCfg.js'></SCRIPT> +<SCRIPT TYPE='text/javascript' LANGUAGE='JavaScript' +SRC='jbossForge/elqNow/elqImg.js'></SCRIPT> + +</head> + +<body> +<!-- HEADER START --> +<!-- this image creates IE problems --> +<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> + +<div class="brand_FED" id="container"> + +<div id="TopLogo"> + <img src="/jbossForge/images/logo.gif" alt="JBoss - The Professional Open Source Company"> +</div> +<div id="TopMenu"> + <table cellpadding="0" cellspacing="0"> + <tbody><tr> + <td class="menu_JBnetwork"><a href="http://network.jboss.com/">JBoss Network</a></td> + <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">JEMS Products</a></td> + <td class="menu_JBcom"><a href="http://www.jboss.com/index">JBoss.com</a></td> + <td class="menu_JBfed"><a href="http://www.jboss.com/federation/index">JBoss Federation</a></td> + </tr> + </tbody></table> +</div> +<div id="ControlMenu"> + <form id="TopSearch" action="http://www.jboss.com/search.jsp"> + <ul> + <li><a href="/portal/authsec">Login</a></li> + <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> + <li><a href="http://www.jboss.com/careers">Careers</a></li> + <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> + <li> + <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="query" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> + <input class="searchbutton" type="image" src="/jbossForge/images/spacer.gif" value="go" align="middle" /> + </li> + </ul> + </form> + +</div> +<!-- HEADER END --> + +<!-- main page table --> +<table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> +<tbody><tr> + <td colspan="2" class="topheader"></td> + </tr> + <tr> + <td class="leftside"><p:region regionName='left'/></td> + <td class="bodycell"><p:region regionName='center'/></td> + + +</tr> +</tbody></table> + +<div id="jbfPageFooter"> + <div id="Copyright"> + JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br> +Theme made by <a href="http://mamut.net.pl">Szimano</a> + </div> +</div> + + + +</body> +</html> + + + + |