From ac0994cc53bd0b9de8b7ed51713c1cd2d2e3799c Mon Sep 17 00:00:00 2001 From: Jonathan Ernst Date: Wed, 2 Feb 2005 04:11:41 +0000 Subject: [PATCH] - use htmlarea when submitting a new version or application - use htmlarea when reviewing a new version or application - don't let admin try to add keywords or webpage to an application version - improved templates and stylesheet to don't break appdb layout --- admin/adminAppQueue.php | 65 ++++++++++++++++++-------------------- admin/editAppVersion.php | 4 +-- application.css | 22 ++++++------- appsubmit.php | 67 +++++++++++++++++++++++++++++++++++----- 4 files changed, 100 insertions(+), 58 deletions(-) diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php index d7123d2..6d22c45 100644 --- a/admin/adminAppQueue.php +++ b/admin/adminAppQueue.php @@ -186,13 +186,20 @@ if ($_REQUEST['sub']) echo '',"\n"; } } + //url + // FIXME: don't display this field for appversion echo 'App URL',"\n"; echo '',"\n"; //desc +?> + + + +App Desc',"\n"; - echo '',"\n"; + echo '

',"\n"; //email message text if ($ob->queueEmail) @@ -249,8 +256,6 @@ if ($_REQUEST['sub']) $aInsert = compile_insert_string( array('appId' => $_REQUEST['appParent'], 'versionName' => $_REQUEST['queueVersion'], 'description' => $_REQUEST['queueDesc'], - 'webPage' => $_REQUEST['queueURL'], - 'keywords' => "", 'maintainer_rating' => "", 'maintainer_release' => "")); if (query_appdb("INSERT INTO `appVersion` ({$aInsert['FIELDS']}) VALUES ({$aInsert['VALUES']})")) @@ -277,8 +282,6 @@ if ($_REQUEST['sub']) $aInsert = compile_insert_string( array('appId' => $_REQUEST['appParent'], 'versionName' => $_REQUEST['queueVersion'], 'description' => $_REQUEST['queueDesc'], - 'webPage' => $_REQUEST['queueURL'], - 'keywords' => "", 'maintainer_rating' => "", 'maintainer_release' => "")); @@ -304,16 +307,20 @@ if ($_REQUEST['sub']) } //Send Status Email - if ($ob->queueEmail && $goodtogo) + if($_REQUEST['type'] == 'ver') { - $sFullAppName = lookupAppName($_REQUEST['appParent'])." Version: ".lookupVersionName($_REQUEST['appVersion']); - - $sSubject = "Application Database Status Report"; - $sMsg = "Your application: ".$sFullAppName." has been entered "; - $sMsg .= "into the application database.\r\n"; - $sMsg .= APPDB_ROOT."appview.php?appId=".$_REQUEST['appParent']."&versionId=".$_REQUEST['appVersion']."\r\n"; + $sFullAppName = lookupAppName($_REQUEST['appParent'])." ".lookupVersionName($_REQUEST['appVersion']); + $sUrl = APPDB_ROOT."appview.php?versionId=".$_REQUEST['appVersion']; + } else + { + $sFullAppName = lookupAppName($_REQUEST['appParent']); + $sUrl = APPDB_ROOT."appview.php?appId=".$_REQUEST['appParent']; + } + $sSubject = $sFullAppName." has been added into the AppDB"; + $sMsg = $sUrl."\n"; + if ($ob->queueEmail && $goodtogo) + { $sMsg .= $emailtext; - mail_appdb($ob->queueEmail, $sSubject ,$sMsg); } if ($goodtogo) @@ -321,18 +328,11 @@ if ($_REQUEST['sub']) $sEmail = get_notify_email_address_list($_REQUEST['appParent'], $_REQUEST['appVersion']); if($sEmail) { - $sFullAppName = "Application: ".lookupAppName($_REQUEST['appParent']). - " Version: ".lookupVersionName($_REQUEST['appVersion']); - $sSubject = "New ".$sFullAppName; - $sMsg = APPDB_ROOT."appview.php?appId=".$_REQUEST['appParent']."&versionId=".$_REQUEST['appVersion']."\r\n"; - $sMsg .= "New Application added to database:\r\n"; - $sMsg .= $sFullAppName."\r\n"; - mail_appdb($sEmail, $sSubject ,$sMsg); } } //done - addmsg("View App", "green"); + addmsg("View App", "green"); redirect(apidb_fullurl("admin/adminAppQueue.php")); exit; } @@ -348,22 +348,17 @@ if ($_REQUEST['sub']) else { //Send Status Email + if($_REQUEST['type'] == 'ver') + { + $sFullAppName = lookupAppName($_REQUEST['appParent'])." ".lookupVersionName($_REQUEST['appVersion']); + } else + { + $sFullAppName = lookupAppName($_REQUEST['appParent']); + } + $sSubject = $sFullAppName." has not been added into the AppDB"; if ($ob->queueEmail) { - if($ob->queueCatId == -1) //app version - { - $sFullAppName = lookupAppName($_REQUEST['appParent'])." Version: ".$ob->queueVersion; - } else - { - $sFullAppName = $ob->queueName." Version: ".$ob->queueVersion; - } - - $sSubject = "Application Database Status Report"; - $sMsg .= "Your application: ".$sFullAppName." has not been entered "; - $sMsg .= "into the application database.\r\n"; - $sMsg .= "Sorry!\r\n"; - $sMsg .= $emailtext; - + $sMsg = $emailtext; mail_appdb($ob->queueEmail, $sSubject ,$sMsg); } //success diff --git a/admin/editAppVersion.php b/admin/editAppVersion.php index 2d590a9..96ef8a3 100644 --- a/admin/editAppVersion.php +++ b/admin/editAppVersion.php @@ -235,8 +235,8 @@ if(isset($_REQUEST['submit1']))
What was not tested:
- burning

"; - $oRow->description .= "

Tested versions
- + $oRow->description .= "

Tested versions

+ diff --git a/application.css b/application.css index 10a55f8..e56b7b3 100644 --- a/application.css +++ b/application.css @@ -2,25 +2,21 @@ /* The following styles are used for application description and notes */ /***********************************************************************/ -BODY { - background-color: #FFFFFF; - color: #000000; - font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; - margin: 0px 10px 0px 0px; - font-size: 12px; - } - -thead { font-weight: bold } - .title { font-weight: bold; } .subtitle { text-decoration: underline; font-style: italic; } .code { font-family: fixed; font-size: 12px; } -table { border: 1px; - font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; - font-size: 12px; } +p { color: #000000; + font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; + font-size: 12px; + } +thead.historyHeader { font-weight: bold } + +table.historyTable { border: 1px; + font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; + font-size: 12px; } td.gold { background-color: #fff600; } td.silver { background-color: silver; } diff --git a/appsubmit.php b/appsubmit.php index 69b6ed0..ecb0e71 100644 --- a/appsubmit.php +++ b/appsubmit.php @@ -103,6 +103,38 @@ if (isset($_REQUEST['queueName'])) ####################################### else if (isset($_REQUEST['apptype'])) { +//FIXME: use absolute path in htmlarea_loader.js to avoid code duplication here +?> + + + + +isLoggedIn()) $email = $_SESSION['current']->sEmail; @@ -146,12 +178,12 @@ else if (isset($_REQUEST['apptype'])) echo '',"\n"; - + echo '',"\n"; echo '',"\n"; - - echo '',"\n"; - echo '',"\n"; + $sDescription = "

Enter description here

"; + echo '',"\n"; + echo '',"\n"; echo '',"\n"; echo '',"\n"; @@ -182,12 +214,31 @@ else if (isset($_REQUEST['apptype'])) echo '',"\n"; echo '',"\n"; - - echo '',"\n"; - echo '',"\n"; + $sDescription = "

This is a template; enter version-specific description here

"; + $sDescription .= "

+ Wine compatibility
+ What works:
+ - settings
+ - help
+
What doesn't work:
+ - erasing
+
What was not tested:
+ - burning
+

"; + $oRow->description .= "

Tested versions

App. versionWine versionInstalls?Runs?Rating
 ',"\n"; $x->make_option_list("altvendor","","vendor","vendorId","vendorName"); echo '
App URL
App Desc
Description

Email
App Version
App URL
+ + + + + + + + + +
App. versionWine versionInstalls?Runs?Rating
3.2320050111yesyesGold
3.2320041201yesyesSilver
3.2120040615yesyesBronze


"; echo 'App Desc',"\n"; - echo '',"\n"; + echo '

',"\n"; echo 'Email',"\n"; echo '',"\n";