[evolvis-commits] r17931: fold notepad and make it a standard feature; simplify it too

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Dec 23 17:14:45 CET 2011


Author: mirabilos
Date: 2011-12-23 17:14:45 +0100 (Fri, 23 Dec 2011)
New Revision: 17931

Removed:
   trunk/gforge_base/evolvisforge-5.1/src/www/include/note.php
Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/DocumentGroupHTML.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumHTML.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/admin/pending-news.php
   trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php
   trunk/gforge_base/evolvisforge-5.1/src/www/js/common.js
   trunk/gforge_base/evolvisforge-5.1/src/www/news/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/news/submit.php
   trunk/gforge_base/evolvisforge-5.1/src/www/pm/pm_task.php
   trunk/gforge_base/evolvisforge-5.1/src/www/survey/include/SurveyHTML.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/item.php
Log:
fold notepad and make it a standard feature; simplify it too


Modified: trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/DocumentGroupHTML.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/DocumentGroupHTML.class.php	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/docman/include/DocumentGroupHTML.class.php	2011-12-23 16:14:45 UTC (rev 17931)
@@ -23,7 +23,6 @@
  */
 
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 
 /**
  * Wrap many group display related functions

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumHTML.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumHTML.class.php	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumHTML.class.php	2011-12-23 16:14:45 UTC (rev 17931)
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once $gfwww.'include/note.php';
 require_once $gfwww.'include/trove.php';
 require_once $gfwww.'news/news_utils.php';
 require_once $gfcommon.'forum/ForumAdmin.class.php';
@@ -492,9 +491,9 @@
 		$g =& $this->Forum->getGroup();
 		$group_id = $g->getID();
 
-		if (forge_check_perm ('forum', $this->Forum->getID(), 'post')) { // minor control, but anyways it should be an admin at this point
-			echo notepad_func();
-			?>
+		if (forge_check_perm ('forum', $this->Forum->getID(), 'post')) {
+			// minor control, but anyways it should be an admin at this point
+?>
 <div align="center">
 	 <form id="ForumEditForm" enctype="multipart/form-data" action="<?php echo util_make_url ('/forum/admin/index.php') ?>" method="post">
 	<?php $objid = $this->Forum->getID();?>
@@ -563,7 +562,6 @@
 				$subject = 'Re: ' . $subject;
 			}
 		}
-		echo notepad_func();
 		?>
 <div align="center">
 <form id="ForumPostForm" enctype="multipart/form-data" action="<?php echo util_make_url ('/forum/forum.php?forum_id='.$this->Forum->getID().'&group_id='.$group_id); ?>" method="post">

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/admin/pending-news.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/admin/pending-news.php	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/admin/pending-news.php	2011-12-23 16:14:45 UTC (rev 17931)
@@ -26,7 +26,6 @@
 
 require_once('../env.inc.php');
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 require_once $gfwww.'news/admin/news_admin_utils.php';
 require_once $gfwww.'news/news_utils.php';
 //common forum tools which are used during the creation/editing of news items

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php	2011-12-23 16:14:45 UTC (rev 17931)
@@ -345,6 +345,9 @@
 ?>
 	<script language="JavaScript" type="text/javascript">//<![CDATA[
 <?php
+		/* provide util_make_url equivalent for ECMAscript */
+		echo "\t\tvar sys_url_base = " .
+		    minijson_encode(util_make_url("/"), false) . ";\n";
 		/* emit extra initial ECMAscript, if any */
 		foreach ($this->extra_js as $line) {
 			echo "\t\t" . $line . "\n";

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php	2011-12-23 16:14:45 UTC (rev 17931)
@@ -24,6 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+require_once($gfcommon."include/minijson.php");
 require_once $gfwww.'include/help.php';
 
 /**
@@ -45,6 +46,10 @@
 	    ' xml:lang="en"' . ">\n<head>";
 	echo '<meta http-equiv="Content-Type" ' .
 	    'content="text/html; charset=utf-8" />' . "\n";
+	echo '<script language="JavaScript" type="text/javascript">//<![CDATA[' .
+	    "\n\tvar sys_url_base = " . minijson_encode(util_make_url("/"),
+	    false) . ";\n" .
+	    "//]]></script>\n";
 	$HTML->headerForgepluckerMeta();
 	echo html_e('title', array(), util_html_secure($title)) . "\n";
 }
@@ -360,7 +365,6 @@
 
 function html_use_tooltips($defaults=false) {
 	global $gfcommon, $HTML;
-	require_once($gfcommon."include/minijson.php");
 
 	if ($defaults === false) {
 		$defaults = array(
@@ -1267,6 +1271,19 @@
 }
 
 
+function notepad_button($form, $kind="") {
+	return html_e('a', array(
+		'href' => 'javascript:notepad_window(' .
+		    minijson_encode($form, false) . ', ' .
+		    minijson_encode($kind, false) . ');',
+		'title' => _('FusionForge Notepad'),
+	    ), html_image('ic/msg.png', '12', '14', array(
+		'alt' => 'Notepad',
+		'border' => '0',
+	    )));
+}
+
+
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/js/common.js
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/js/common.js	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/js/common.js	2011-12-23 16:14:45 UTC (rev 17931)
@@ -262,3 +262,12 @@
 		    "; expires=Thu, 01-Jan-70 00:00:01 GMT";
 	}
 }
+
+function notepad_window(form, kind) {
+	var notepad_url = sys_url_base + "notepad.php?form=" + form +
+	    "&kind=" + kind + "&rows=32&cols=80";
+	var notepad_title = "FusionForge Notepad";
+	var notepad_winopt = "scrollbars=yes,resizable=yes,toolbar=no," +
+	    "height=700,width=620";
+	NotepadWin = window.open(notepad_url, notepad_title, notepad_winopt);
+}

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/news/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/news/admin/index.php	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/news/admin/index.php	2011-12-23 16:14:45 UTC (rev 17931)
@@ -25,7 +25,6 @@
 
 require_once('../../env.inc.php');
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 require_once $gfwww.'news/admin/news_admin_utils.php';
 require_once $gfwww.'news/news_utils.php';
 //common forum tools which are used during the creation/editing of news items
@@ -122,7 +121,6 @@
 		
 		$group = group_get_object($group_id);
 		
-		echo notepad_func();
 		echo '
 		<p />
 		<form id="newsadminform" action="'.getStringFromServer('PHP_SELF').'" method="post">

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/news/submit.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/news/submit.php	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/news/submit.php	2011-12-23 16:14:45 UTC (rev 17931)
@@ -48,7 +48,6 @@
 
 require_once('../env.inc.php');
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 require_once $gfwww.'news/news_utils.php';
 require_once $gfcommon.'forum/Forum.class.php';
 require_once $gfcommon.'include/TextSanitizer.class.php'; // to make the HTML input by the user safe to store
@@ -135,11 +134,9 @@
 	$group = group_get_object($group_id);
 	news_header(array('title'=>_('Submit News for Project: ').' '.$group->getPublicName()));
 
-	$jsfunc = notepad_func();
-
 	echo '
 		<p>
-		'. sprintf(_('You can post news about your project if you are an admin on your project. You may also post "help wanted" notes if your project needs help.</p><p>All posts <b>for your project</b> will appear instantly on your project summary page. Posts that are of special interest to the community will have to be approved by a member of the %1$s news team before they will appear on the %1$s home page.</p><p>You may include URLs, but not HTML in your submissions.</p><p>URLs that start with http:// are made clickable.'), forge_get_config ('forge_name')) .'</p>' . $jsfunc . 
+		'. sprintf(_('You can post news about your project if you are an admin on your project. You may also post "help wanted" notes if your project needs help.</p><p>All posts <b>for your project</b> will appear instantly on your project summary page. Posts that are of special interest to the community will have to be approved by a member of the %1$s news team before they will appear on the %1$s home page.</p><p>You may include URLs, but not HTML in your submissions.</p><p>URLs that start with http:// are made clickable.'), forge_get_config ('forge_name')) .'</p>' .
 		'
 		<form id="newssubmitform" action="'.getStringFromServer('PHP_SELF').'" method="post">
 		<input type="hidden" name="group_id" value="'.$group_id.'" />

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/pm_task.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/pm_task.php	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/pm_task.php	2011-12-23 16:14:45 UTC (rev 17931)
@@ -28,7 +28,6 @@
 
 //require_once('../env.inc.php'); //Page gets included from task.php. The files are available in task.php
 //require_once $gfcommon.'include/pre.php'; //Page gets included from task.php. The files are available in task.php
-require_once $gfwww.'include/note.php';
 require_once $gfcommon.'reporting/report_utils.php';
 require_once $gfcommon.'reporting/Report.class.php';
 
@@ -52,7 +51,6 @@
 
 pm_header($headerArray);
 
-echo notepad_func();
 session_require_login(); //Needed for?
 
 $boolManager = false;

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/survey/include/SurveyHTML.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/survey/include/SurveyHTML.class.php	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/survey/include/SurveyHTML.class.php	2011-12-23 16:14:45 UTC (rev 17931)
@@ -25,7 +25,6 @@
  */
 
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 
 /**
  * Survey HTML related functions

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/index.php	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/index.php	2011-12-23 16:14:45 UTC (rev 17931)
@@ -25,7 +25,6 @@
 
 require_once('../env.inc.php');
 require_once $gfcommon.'include/pre.php';
-require_once $gfwww.'include/note.php';
 require_once $gfcommon.'tracker/Artifact.class.php';
 require_once $gfcommon.'tracker/ArtifactFile.class.php';
 require_once $gfwww.'tracker/include/ArtifactFileHtml.class.php';

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/item.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/item.php	2011-12-23 15:20:30 UTC (rev 17930)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/item.php	2011-12-23 16:14:45 UTC (rev 17931)
@@ -91,7 +91,6 @@
 		'atid' => $atid,
 	    ));
 }
-echo notepad_func();
 
 function getselfhref($p=array(),$return_encoded=true) {
 	global $group_id, $atid, $aid, $is_add;



More information about the evolvis-commits mailing list