[Everydevel-opers] SF.net SVN: everydevel:[1012] trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1012
          http://everydevel.svn.sourceforge.net/everydevel/?rev=1012&view=rev
Author:   paul_the_nomad
Date:     2008-09-05 11:00:17 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
Capitalise nodelet titles. And codelisting in monospace rather than fixed.

Modified Paths:
--------------
    trunk/ebase/TODO
    trunk/ecore/ME
    trunk/ecore/nodes/htmlpage/container_display_page.xml
    trunk/ecore/nodes/htmlsnippet/stdstylesheet.xml
    trunk/ecore/nodes/nodeletgroup/all_nodelets.xml
    trunk/ecore/nodes/nodeletgroup/default_nodelets.xml
    trunk/ecore/nodes/nodeletgroup/system_nodelets.xml

Added Paths:
-----------
    trunk/ecore/nodes/nodelet/Admin_Nodelet.xml
    trunk/ecore/nodes/nodelet/Admin_Nodelet_Mini.xml
    trunk/ecore/nodes/nodelet/Personal_Nodelet.xml
    trunk/ecore/nodes/nodelet/Workspace_Info.xml

Removed Paths:
-------------
    trunk/ecore/nodes/nodelet/admin_Nodelet_Mini.xml
    trunk/ecore/nodes/nodelet/admin_nodelet.xml
    trunk/ecore/nodes/nodelet/personal_nodelet.xml
    trunk/ecore/nodes/nodelet/workspace_info.xml

Modified: trunk/ebase/TODO
===================================================================

--- trunk/ebase/TODO	2008-07-12 11:56:47 UTC (rev 1011)
+++ trunk/ebase/TODO	2008-09-05 11:00:17 UTC (rev 1012)
@@ -8,11 +8,6 @@
 * Amend FromObject.pm so that form objects return labels with a 'for'
    attribute and id in the input tag.
 
-* Require Everything::HTML::Response classes to create certain HTTP headers
-
-* Everything::HTML::Response classes to return error values on error -
-   e.g. Forbidden 
-
 * Change default DB (for all DBs) setup so default encoding is utf8
 
 * Documentation - Ecore should be self documenting
@@ -49,4 +44,16 @@
 
    This may involve creating objects that are a superclass of nodes,
    i.e. nodes are an 'object' and links are also 'objects', of making
-   links nodes.  In the latter case, nodes will have to be slimmed down.
\ No newline at end of file
+   links nodes.  In the latter case, nodes will have to be slimmed
+   down.
+
+* Port enote and preview
+
+* Implement Captcha
+
+  Get rid of comment spam  
+  Probably use Authen::Captcha
+
+* Implement session keys
+
+   Track user sessions deal with comment spam etc
\ No newline at end of file

Modified: trunk/ecore/ME
===================================================================
--- trunk/ecore/ME	2008-07-12 11:56:47 UTC (rev 1011)
+++ trunk/ecore/ME	2008-09-05 11:00:17 UTC (rev 1012)
@@ -88,10 +88,10 @@
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Other Users Mini</member>
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Server Statistics</member>
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Tick tock</member>
-    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">admin Nodelet Mini</member>
-    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">admin nodelet</member>
-    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">personal nodelet</member>
-    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">workspace info</member>
+    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Admin Nodelet Mini</member>
+    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Admin Nodelet</member>
+    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Personal Nodelet</member>
+    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Workspace Info</member>
     <member name="group_node" type="noderef" type_nodetype="mail,nodetype">New User Mail</member>
     <member name="group_node" type="noderef" type_nodetype="mail,nodetype">Password Mail</member>
     <member name="group_node" type="noderef" type_nodetype="location,nodetype">container</member>

Modified: trunk/ecore/nodes/htmlpage/container_display_page.xml
===================================================================
--- trunk/ecore/nodes/htmlpage/container_display_page.xml	2008-07-12 11:56:47 UTC (rev 1011)
+++ trunk/ecore/nodes/htmlpage/container_display_page.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -24,7 +24,7 @@
 my $DB = $this-&gt;get_nodebase;
 my %GLOBAL;
 
-return $this-&gt;link_node-&gt;($$NODE{parent_container}) if $$NODE{parent_container};
+return $this-&gt;link_node($$NODE{parent_container}) if $$NODE{parent_container};
 &quot;&lt;i&gt;none&lt;/i&gt;&quot;;
 %]
 

Modified: trunk/ecore/nodes/htmlsnippet/stdstylesheet.xml
===================================================================
--- trunk/ecore/nodes/htmlsnippet/stdstylesheet.xml	2008-07-12 11:56:47 UTC (rev 1011)
+++ trunk/ecore/nodes/htmlsnippet/stdstylesheet.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -180,7 +180,7 @@
 }
 
 .listcode {
-font-family: fixed;
+font-family: monospace;
 font-size:12pt;
 width: 90%;
 border-width: 3px;

Copied: trunk/ecore/nodes/nodelet/Admin_Nodelet.xml (from rev 1011, trunk/ecore/nodes/nodelet/admin_nodelet.xml)
===================================================================
--- trunk/ecore/nodes/nodelet/Admin_Nodelet.xml	                        (rev 0)
+++ trunk/ecore/nodes/nodelet/Admin_Nodelet.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -0,0 +1,74 @@
+<NODE export_version="0.5" nodetype="nodelet" title="Admin Nodelet">
+  <field name="author_user" type="noderef" type_nodetype="user,nodetype">root</field>
+  <field name="authoraccess" type="literal_value">-i-i</field>
+  <field name="dynamicauthor_permission" type="literal_value">0</field>
+  <field name="dynamicgroup_permission" type="literal_value">0</field>
+  <field name="dynamicguest_permission" type="literal_value">0</field>
+  <field name="dynamicother_permission" type="literal_value">-1</field>
+  <field name="group_usergroup" type="literal_value">-1</field>
+  <field name="groupaccess" type="literal_value">-i-i-</field>
+  <field name="guestaccess" type="literal_value">-i-i-</field>
+  <field name="loc_location" type="noderef" type_nodetype="location,nodetype">nodelet</field>
+  <field name="mini_nodelet" type="noderef" type_nodetype="nodelet,nodetype">Admin Nodelet Mini</field>
+  <field name="nlcode" type="literal_value">&lt;table&gt;
+ &lt;tr style=&quot;padding: none&quot;&gt;
+  &lt;td&gt;
+[%
+my $query = $this-&gt;get_query;
+my $str = $query-&gt;start_form(&quot;POST&quot;,$query-&gt;script_name);
+$str .= $query-&gt;p( { style =&gt;  'line-height: 1.0' }, &quot;node&quot; . '&amp;nbsp;' .
+        $query-&gt;textfield(-name =&gt; &quot;node&quot;, -default =&gt; &quot;&quot;,
+     -override =&gt; 1, -size =&gt; 10, -maxlength =&gt; 240) .
+     '&amp;nbsp;' .
+     $this-&gt;submit );
+
+$str .= $query-&gt;end_form;
+%]
+  &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+  &lt;td style=&quot;padding: none&quot;&gt;
+[%
+my $query = $this-&gt;get_query;
+my $str = $query-&gt;start_form(&quot;POST&quot;,$query-&gt;script_name);
+$str .= $query-&gt;p( { style =&gt;  'line-height: 1.0' }, &quot;id &amp;nbsp;&quot; . 
+        $query-&gt;textfield(-name =&gt; &quot;node_id&quot;,
+  -default =&gt; &quot;&quot;, -override =&gt; 1, -size =&gt; 10,
+  -maxlength =&gt; 240) . '&amp;nbsp;'.
+  $this-&gt;submit );
+
+$str .= $query-&gt;end_form;
+%]
+  &lt;/td&gt;
+ &lt;/tr&gt;
+ &lt;tr&gt;
+  &lt;td style=&quot;font-size: 110%&quot;&gt;
+[%
+my $NODE = $this-&gt;get_node;
+my $query = $this-&gt;get_query;
+my $str = &quot;&lt;a href=&quot;; 
+my $displaytype = $query-&gt;param('displaytype');
+$displaytype ||= 'display';
+$str .= $this-&gt;url_gen({ 'node_id' =&gt; $this-&gt;get_nodebase-&gt;getId($NODE),
+ 'displaytype' =&gt; $displaytype,
+ 'containers' =&gt; 'show'}).&quot; &gt;Show containers&lt;/a&gt;&quot;;
+
+%]&lt;br/&gt;
+
+   [%
+$this-&gt;link_node($this-&gt;get_nodebase-&gt;getNode('create node', 'restricted_superdoc'),
+  'Create new node'); 
+%]&lt;br/&gt;
+   Current node id: [% $this-&gt;get_node-&gt;get_node_id
+%]
+  &lt;/td&gt;
+ &lt;/tr&gt;
+&lt;/table&gt;
+
+[&lt;adminbox&gt;]</field>
+  <field name="otheraccess" type="literal_value">-i-i-</field>
+  <field name="parent_container" type="noderef" type_nodetype="container,nodetype">general nodelet container</field>
+  <field name="title" type="literal_value">Admin Nodelet</field>
+  <field name="type_nodetype" type="noderef" type_nodetype="nodetype,nodetype">nodelet</field>
+  <field name="updateinterval" type="literal_value">0</field>
+</NODE>


Property changes on: trunk/ecore/nodes/nodelet/Admin_Nodelet.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Copied: trunk/ecore/nodes/nodelet/Admin_Nodelet_Mini.xml (from rev 1011, trunk/ecore/nodes/nodelet/admin_Nodelet_Mini.xml)
===================================================================
--- trunk/ecore/nodes/nodelet/Admin_Nodelet_Mini.xml	                        (rev 0)
+++ trunk/ecore/nodes/nodelet/Admin_Nodelet_Mini.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -0,0 +1,19 @@
+<NODE export_version="0.5" nodetype="nodelet" title="Admin Nodelet Mini">
+  <field name="author_user" type="noderef" type_nodetype="user,nodetype">root</field>
+  <field name="authoraccess" type="literal_value">ii-i</field>
+  <field name="dynamicauthor_permission" type="literal_value">-1</field>
+  <field name="dynamicgroup_permission" type="literal_value">-1</field>
+  <field name="dynamicguest_permission" type="literal_value">-1</field>
+  <field name="dynamicother_permission" type="literal_value">-1</field>
+  <field name="group_usergroup" type="literal_value">-1</field>
+  <field name="groupaccess" type="literal_value">ii-i-</field>
+  <field name="guestaccess" type="literal_value">ii-i-</field>
+  <field name="loc_location" type="noderef" type_nodetype="location,nodetype">nodelet</field>
+  <field name="mini_nodelet" type="noderef" type_nodetype="nodelet,nodetype">Admin Nodelet</field>
+  <field name="nlcode" type="literal_value">[&lt;adminbox&gt;]</field>
+  <field name="otheraccess" type="literal_value">ii-i-</field>
+  <field name="parent_container" type="noderef" type_nodetype="container,nodetype">general nodelet container</field>
+  <field name="title" type="literal_value">Admin Nodelet Mini</field>
+  <field name="type_nodetype" type="noderef" type_nodetype="nodetype,nodetype">nodelet</field>
+  <field name="updateinterval" type="literal_value">0</field>
+</NODE>


Property changes on: trunk/ecore/nodes/nodelet/Admin_Nodelet_Mini.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Copied: trunk/ecore/nodes/nodelet/Personal_Nodelet.xml (from rev 1011, trunk/ecore/nodes/nodelet/personal_nodelet.xml)
===================================================================
--- trunk/ecore/nodes/nodelet/Personal_Nodelet.xml	                        (rev 0)
+++ trunk/ecore/nodes/nodelet/Personal_Nodelet.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -0,0 +1,56 @@
+<NODE export_version="0.5" nodetype="nodelet" title="Personal Nodelet">
+  <field name="author_user" type="noderef" type_nodetype="user,nodetype">root</field>
+  <field name="authoraccess" type="literal_value">iiii</field>
+  <field name="dynamicauthor_permission" type="literal_value">-1</field>
+  <field name="dynamicgroup_permission" type="literal_value">-1</field>
+  <field name="dynamicguest_permission" type="literal_value">-1</field>
+  <field name="dynamicother_permission" type="literal_value">-1</field>
+  <field name="group_usergroup" type="literal_value">-1</field>
+  <field name="groupaccess" type="literal_value">iiii-</field>
+  <field name="guestaccess" type="literal_value">iiii-</field>
+  <field name="loc_location" type="noderef" type_nodetype="location,nodetype">nodelet</field>
+  <field name="mini_nodelet" type="literal_value">0</field>
+  <field name="nlcode" type="literal_value">[%
+my $NODE = $this-&gt;get_node;
+my $USER = $this-&gt;get_user;
+my $query = $this-&gt;get_query;
+my $THEME = $this-&gt;get_theme;
+my %HTMLVARS = %{ $this-&gt;get_htmlvars };
+my $VARS = $this-&gt;get_vars;
+my $DB = $this-&gt;get_nodebase;
+my %GLOBAL;
+
+
+  return if ($$USER{node_id} == $HTMLVARS{guest_user});
+  my $limit = $HTMLVARS{personalNodeletLimit} || 10;
+
+  my @nodes;
+  @nodes = split(&quot;&lt;br&gt;&quot;,$$VARS{personal_nodelet}) if ($$VARS{personal_nodelet});
+  if (my $n = $query-&gt;param(&quot;addpersonalnodelet&quot;)) {
+    $n = $DB-&gt;getNodeById( $n );
+    $$VARS{personal_nodelet} .= '&lt;br&gt;'.$$n{title}
+      if @nodes &lt; $limit;
+    push @nodes, $$n{title};
+  }
+
+
+  my $str;
+  my $i=0;
+  foreach (@nodes) {
+    $str.=$this-&gt;link_node_title($_).&quot;&lt;br&gt;\n&quot;;
+    last if $i++ &gt;= 10;
+  }
+
+  $str.=&quot;\n&lt;p align=right&gt;&quot;
+    .$this-&gt;link_node($NODE, &quot;add \&quot;$$NODE{title}\&quot;&quot;, {addpersonalnodelet =&gt; $NODE-&gt;get_node_id})
+    if @nodes &lt; $limit;
+  $str;
+
+
+%]</field>
+  <field name="otheraccess" type="literal_value">iiii-</field>
+  <field name="parent_container" type="noderef" type_nodetype="container,nodetype">general nodelet container</field>
+  <field name="title" type="literal_value">Personal Nodelet</field>
+  <field name="type_nodetype" type="noderef" type_nodetype="nodetype,nodetype">nodelet</field>
+  <field name="updateinterval" type="literal_value">0</field>
+</NODE>


Property changes on: trunk/ecore/nodes/nodelet/Personal_Nodelet.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Copied: trunk/ecore/nodes/nodelet/Workspace_Info.xml (from rev 1011, trunk/ecore/nodes/nodelet/workspace_info.xml)
===================================================================
--- trunk/ecore/nodes/nodelet/Workspace_Info.xml	                        (rev 0)
+++ trunk/ecore/nodes/nodelet/Workspace_Info.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -0,0 +1,75 @@
+<NODE export_version="0.5" nodetype="nodelet" title="Workspace Info">
+  <field name="author_user" type="noderef" type_nodetype="user,nodetype">root</field>
+  <field name="authoraccess" type="literal_value">iiii</field>
+  <field name="dynamicauthor_permission" type="literal_value">-1</field>
+  <field name="dynamicgroup_permission" type="literal_value">-1</field>
+  <field name="dynamicguest_permission" type="literal_value">-1</field>
+  <field name="dynamicother_permission" type="literal_value">-1</field>
+  <field name="group_usergroup" type="literal_value">-1</field>
+  <field name="groupaccess" type="literal_value">iiiii</field>
+  <field name="guestaccess" type="literal_value">iiiii</field>
+  <field name="loc_location" type="noderef" type_nodetype="location,nodetype">nodelet</field>
+  <field name="mini_nodelet" type="literal_value">0</field>
+  <field name="nlcode" type="literal_value">[%
+my $NODE = $this-&gt;get_node;
+my $USER = $this-&gt;get_user;
+my $query = $this-&gt;get_query;
+my $THEME = $this-&gt;get_theme;
+my %HTMLVARS = %{ $this-&gt;get_htmlvars };
+my $VARS = $this-&gt;get_vars;
+my $DB = $this-&gt;get_nodebase;
+my %GLOBAL;
+
+
+my $wspace = 0;
+my $str;
+$wspace = $DB-&gt;{workspace}{node_id} if exists $DB-&gt;{workspace};
+
+my $csr = $DB-&gt;sqlSelectMany(&quot;inside_workspace&quot;, &quot;revision&quot;, &quot;node_id=$$NODE{node_id}&quot;);
+my %WSPACES;
+while ($csr and my ($ws) = $csr-&gt;fetchrow) {
+  next if not $ws;
+  next if $ws == $wspace;
+  next if $WSPACES{$ws} == 1;
+  $WSPACES{$ws} = 1;
+  $str.= &quot;This node is in workspace &quot;.$this-&gt;link_node($ws).&quot;&lt;br&gt;&quot;;
+}
+$str.=&quot;Editing it may cause corruption&lt;br&gt;&quot; if $str;
+$str;
+
+%][%
+my $NODE = $this-&gt;get_node;
+my $USER = $this-&gt;get_user;
+my $query = $this-&gt;get_query;
+my $THEME = $this-&gt;get_theme;
+my %HTMLVARS = %{ $this-&gt;get_htmlvars };
+my $VARS = $this-&gt;get_vars;
+my $DB = $this-&gt;get_nodebase;
+my %GLOBAL;
+
+
+return &quot;Not in workspace&quot; unless $DB-&gt;{workspace} and $DB-&gt;{workspace}{title};
+my $str;
+
+$str.=&quot;You are in workspace &quot;.linkNode($DB-&gt;{workspace});
+$str.=&quot;&lt;p&gt;&lt;b&gt;This node can not be put in workspace&lt;/b&gt;&quot; unless $NODE-&gt;canWorkspace();
+
+if (exists $DB-&gt;{workspace}{nodes}{$$NODE{node_id}}) {
+  $str.=&quot;&lt;p&gt;This node is inside your workspace:&quot;;
+  $str.=&quot;&lt;br&gt;&quot;.linkNode($NODE, &quot;Commit&quot;, { op=&gt; 'commitworkspace', 
+       &quot;commit_$$NODE{node_id}&quot; =&gt; 'commit', 
+        workspace_id =&gt; $DB-&gt;{workspace}{node_id}}). &quot; changes&quot;;
+  $str.=&quot;&lt;br&gt;&quot;.linkNode($NODE, &quot;Discard&quot;, { op =&gt; 'commitworkspace',
+       &quot;commit_$$NODE{node_id}&quot; =&gt; 'discard',
+       workspace_id =&gt; $DB-&gt;{workspace}{node_id}}). &quot; changes&quot;;
+}
+
+$str;
+
+%]</field>
+  <field name="otheraccess" type="literal_value">iiiii</field>
+  <field name="parent_container" type="noderef" type_nodetype="container,nodetype">general nodelet container</field>
+  <field name="title" type="literal_value">Workspace Info</field>
+  <field name="type_nodetype" type="noderef" type_nodetype="nodetype,nodetype">nodelet</field>
+  <field name="updateinterval" type="literal_value">0</field>
+</NODE>


Property changes on: trunk/ecore/nodes/nodelet/Workspace_Info.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Deleted: trunk/ecore/nodes/nodelet/admin_Nodelet_Mini.xml
===================================================================
--- trunk/ecore/nodes/nodelet/admin_Nodelet_Mini.xml	2008-07-12 11:56:47 UTC (rev 1011)
+++ trunk/ecore/nodes/nodelet/admin_Nodelet_Mini.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -1,19 +0,0 @@
-<NODE export_version="0.5" nodetype="nodelet" title="admin Nodelet Mini">
-  <field name="author_user" type="noderef" type_nodetype="user,nodetype">root</field>
-  <field name="authoraccess" type="literal_value">ii-i</field>
-  <field name="dynamicauthor_permission" type="literal_value">-1</field>
-  <field name="dynamicgroup_permission" type="literal_value">-1</field>
-  <field name="dynamicguest_permission" type="literal_value">-1</field>
-  <field name="dynamicother_permission" type="literal_value">-1</field>
-  <field name="group_usergroup" type="literal_value">-1</field>
-  <field name="groupaccess" type="literal_value">ii-i-</field>
-  <field name="guestaccess" type="literal_value">ii-i-</field>
-  <field name="loc_location" type="noderef" type_nodetype="location,nodetype">nodelet</field>
-  <field name="mini_nodelet" type="noderef" type_nodetype="nodelet,nodetype">admin nodelet</field>
-  <field name="nlcode" type="literal_value">[&lt;adminbox&gt;]</field>
-  <field name="otheraccess" type="literal_value">ii-i-</field>
-  <field name="parent_container" type="noderef" type_nodetype="container,nodetype">general nodelet container</field>
-  <field name="title" type="literal_value">admin Nodelet Mini</field>
-  <field name="type_nodetype" type="noderef" type_nodetype="nodetype,nodetype">nodelet</field>
-  <field name="updateinterval" type="literal_value">0</field>
-</NODE>

Deleted: trunk/ecore/nodes/nodelet/admin_nodelet.xml
===================================================================
--- trunk/ecore/nodes/nodelet/admin_nodelet.xml	2008-07-12 11:56:47 UTC (rev 1011)
+++ trunk/ecore/nodes/nodelet/admin_nodelet.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -1,74 +0,0 @@
-<NODE export_version="0.5" nodetype="nodelet" title="admin nodelet">
-  <field name="author_user" type="noderef" type_nodetype="user,nodetype">root</field>
-  <field name="authoraccess" type="literal_value">-i-i</field>
-  <field name="dynamicauthor_permission" type="literal_value">0</field>
-  <field name="dynamicgroup_permission" type="literal_value">0</field>
-  <field name="dynamicguest_permission" type="literal_value">0</field>
-  <field name="dynamicother_permission" type="literal_value">-1</field>
-  <field name="group_usergroup" type="literal_value">-1</field>
-  <field name="groupaccess" type="literal_value">-i-i-</field>
-  <field name="guestaccess" type="literal_value">-i-i-</field>
-  <field name="loc_location" type="noderef" type_nodetype="location,nodetype">nodelet</field>
-  <field name="mini_nodelet" type="noderef" type_nodetype="nodelet,nodetype">admin Nodelet Mini</field>
-  <field name="nlcode" type="literal_value">&lt;table&gt;
- &lt;tr style=&quot;padding: none&quot;&gt;
-  &lt;td&gt;
-[%
-my $query = $this-&gt;get_query;
-my $str = $query-&gt;start_form(&quot;POST&quot;,$query-&gt;script_name);
-$str .= $query-&gt;p( { style =&gt;  'line-height: 1.0' }, &quot;node&quot; . '&amp;nbsp;' .
-        $query-&gt;textfield(-name =&gt; &quot;node&quot;, -default =&gt; &quot;&quot;,
-     -override =&gt; 1, -size =&gt; 10, -maxlength =&gt; 240) .
-     '&amp;nbsp;' .
-     $this-&gt;submit );
-
-$str .= $query-&gt;end_form;
-%]
-  &lt;/td&gt;
- &lt;/tr&gt;
- &lt;tr&gt;
-  &lt;td style=&quot;padding: none&quot;&gt;
-[%
-my $query = $this-&gt;get_query;
-my $str = $query-&gt;start_form(&quot;POST&quot;,$query-&gt;script_name);
-$str .= $query-&gt;p( { style =&gt;  'line-height: 1.0' }, &quot;id &amp;nbsp;&quot; . 
-        $query-&gt;textfield(-name =&gt; &quot;node_id&quot;,
-  -default =&gt; &quot;&quot;, -override =&gt; 1, -size =&gt; 10,
-  -maxlength =&gt; 240) . '&amp;nbsp;'.
-  $this-&gt;submit );
-
-$str .= $query-&gt;end_form;
-%]
-  &lt;/td&gt;
- &lt;/tr&gt;
- &lt;tr&gt;
-  &lt;td style=&quot;font-size: 110%&quot;&gt;
-[%
-my $NODE = $this-&gt;get_node;
-my $query = $this-&gt;get_query;
-my $str = &quot;&lt;a href=&quot;; 
-my $displaytype = $query-&gt;param('displaytype');
-$displaytype ||= 'display';
-$str .= $this-&gt;url_gen({ 'node_id' =&gt; $this-&gt;get_nodebase-&gt;getId($NODE),
- 'displaytype' =&gt; $displaytype,
- 'containers' =&gt; 'show'}).&quot; &gt;Show containers&lt;/a&gt;&quot;;
-
-%]&lt;br/&gt;
-
-   [%
-$this-&gt;link_node($this-&gt;get_nodebase-&gt;getNode('create node', 'restricted_superdoc'),
-  'Create new node'); 
-%]&lt;br/&gt;
-   Current node id: [% $this-&gt;get_node-&gt;get_node_id
-%]
-  &lt;/td&gt;
- &lt;/tr&gt;
-&lt;/table&gt;
-
-[&lt;adminbox&gt;]</field>
-  <field name="otheraccess" type="literal_value">-i-i-</field>
-  <field name="parent_container" type="noderef" type_nodetype="container,nodetype">general nodelet container</field>
-  <field name="title" type="literal_value">admin nodelet</field>
-  <field name="type_nodetype" type="noderef" type_nodetype="nodetype,nodetype">nodelet</field>
-  <field name="updateinterval" type="literal_value">0</field>
-</NODE>

Deleted: trunk/ecore/nodes/nodelet/personal_nodelet.xml
===================================================================
--- trunk/ecore/nodes/nodelet/personal_nodelet.xml	2008-07-12 11:56:47 UTC (rev 1011)
+++ trunk/ecore/nodes/nodelet/personal_nodelet.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -1,56 +0,0 @@
-<NODE export_version="0.5" nodetype="nodelet" title="personal nodelet">
-  <field name="author_user" type="noderef" type_nodetype="user,nodetype">root</field>
-  <field name="authoraccess" type="literal_value">iiii</field>
-  <field name="dynamicauthor_permission" type="literal_value">-1</field>
-  <field name="dynamicgroup_permission" type="literal_value">-1</field>
-  <field name="dynamicguest_permission" type="literal_value">-1</field>
-  <field name="dynamicother_permission" type="literal_value">-1</field>
-  <field name="group_usergroup" type="literal_value">-1</field>
-  <field name="groupaccess" type="literal_value">iiii-</field>
-  <field name="guestaccess" type="literal_value">iiii-</field>
-  <field name="loc_location" type="noderef" type_nodetype="location,nodetype">nodelet</field>
-  <field name="mini_nodelet" type="literal_value">0</field>
-  <field name="nlcode" type="literal_value">[%
-my $NODE = $this-&gt;get_node;
-my $USER = $this-&gt;get_user;
-my $query = $this-&gt;get_query;
-my $THEME = $this-&gt;get_theme;
-my %HTMLVARS = %{ $this-&gt;get_htmlvars };
-my $VARS = $this-&gt;get_vars;
-my $DB = $this-&gt;get_nodebase;
-my %GLOBAL;
-
-
-  return if ($$USER{node_id} == $HTMLVARS{guest_user});
-  my $limit = $HTMLVARS{personalNodeletLimit} || 10;
-
-  my @nodes;
-  @nodes = split(&quot;&lt;br&gt;&quot;,$$VARS{personal_nodelet}) if ($$VARS{personal_nodelet});
-  if (my $n = $query-&gt;param(&quot;addpersonalnodelet&quot;)) {
-    $n = $DB-&gt;getNodeById( $n );
-    $$VARS{personal_nodelet} .= '&lt;br&gt;'.$$n{title}
-      if @nodes &lt; $limit;
-    push @nodes, $$n{title};
-  }
-
-
-  my $str;
-  my $i=0;
-  foreach (@nodes) {
-    $str.=$this-&gt;link_node_title($_).&quot;&lt;br&gt;\n&quot;;
-    last if $i++ &gt;= 10;
-  }
-
-  $str.=&quot;\n&lt;p align=right&gt;&quot;
-    .$this-&gt;link_node($NODE, &quot;add \&quot;$$NODE{title}\&quot;&quot;, {addpersonalnodelet =&gt; $NODE-&gt;get_node_id})
-    if @nodes &lt; $limit;
-  $str;
-
-
-%]</field>
-  <field name="otheraccess" type="literal_value">iiii-</field>
-  <field name="parent_container" type="noderef" type_nodetype="container,nodetype">general nodelet container</field>
-  <field name="title" type="literal_value">personal nodelet</field>
-  <field name="type_nodetype" type="noderef" type_nodetype="nodetype,nodetype">nodelet</field>
-  <field name="updateinterval" type="literal_value">0</field>
-</NODE>

Deleted: trunk/ecore/nodes/nodelet/workspace_info.xml
===================================================================
--- trunk/ecore/nodes/nodelet/workspace_info.xml	2008-07-12 11:56:47 UTC (rev 1011)
+++ trunk/ecore/nodes/nodelet/workspace_info.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -1,75 +0,0 @@
-<NODE export_version="0.5" nodetype="nodelet" title="workspace info">
-  <field name="author_user" type="noderef" type_nodetype="user,nodetype">root</field>
-  <field name="authoraccess" type="literal_value">iiii</field>
-  <field name="dynamicauthor_permission" type="literal_value">-1</field>
-  <field name="dynamicgroup_permission" type="literal_value">-1</field>
-  <field name="dynamicguest_permission" type="literal_value">-1</field>
-  <field name="dynamicother_permission" type="literal_value">-1</field>
-  <field name="group_usergroup" type="literal_value">-1</field>
-  <field name="groupaccess" type="literal_value">iiiii</field>
-  <field name="guestaccess" type="literal_value">iiiii</field>
-  <field name="loc_location" type="noderef" type_nodetype="location,nodetype">nodelet</field>
-  <field name="mini_nodelet" type="literal_value">0</field>
-  <field name="nlcode" type="literal_value">[%
-my $NODE = $this-&gt;get_node;
-my $USER = $this-&gt;get_user;
-my $query = $this-&gt;get_query;
-my $THEME = $this-&gt;get_theme;
-my %HTMLVARS = %{ $this-&gt;get_htmlvars };
-my $VARS = $this-&gt;get_vars;
-my $DB = $this-&gt;get_nodebase;
-my %GLOBAL;
-
-
-my $wspace = 0;
-my $str;
-$wspace = $DB-&gt;{workspace}{node_id} if exists $DB-&gt;{workspace};
-
-my $csr = $DB-&gt;sqlSelectMany(&quot;inside_workspace&quot;, &quot;revision&quot;, &quot;node_id=$$NODE{node_id}&quot;);
-my %WSPACES;
-while ($csr and my ($ws) = $csr-&gt;fetchrow) {
-  next if not $ws;
-  next if $ws == $wspace;
-  next if $WSPACES{$ws} == 1;
-  $WSPACES{$ws} = 1;
-  $str.= &quot;This node is in workspace &quot;.$this-&gt;link_node($ws).&quot;&lt;br&gt;&quot;;
-}
-$str.=&quot;Editing it may cause corruption&lt;br&gt;&quot; if $str;
-$str;
-
-%][%
-my $NODE = $this-&gt;get_node;
-my $USER = $this-&gt;get_user;
-my $query = $this-&gt;get_query;
-my $THEME = $this-&gt;get_theme;
-my %HTMLVARS = %{ $this-&gt;get_htmlvars };
-my $VARS = $this-&gt;get_vars;
-my $DB = $this-&gt;get_nodebase;
-my %GLOBAL;
-
-
-return &quot;Not in workspace&quot; unless $DB-&gt;{workspace} and $DB-&gt;{workspace}{title};
-my $str;
-
-$str.=&quot;You are in workspace &quot;.linkNode($DB-&gt;{workspace});
-$str.=&quot;&lt;p&gt;&lt;b&gt;This node can not be put in workspace&lt;/b&gt;&quot; unless $NODE-&gt;canWorkspace();
-
-if (exists $DB-&gt;{workspace}{nodes}{$$NODE{node_id}}) {
-  $str.=&quot;&lt;p&gt;This node is inside your workspace:&quot;;
-  $str.=&quot;&lt;br&gt;&quot;.linkNode($NODE, &quot;Commit&quot;, { op=&gt; 'commitworkspace', 
-       &quot;commit_$$NODE{node_id}&quot; =&gt; 'commit', 
-        workspace_id =&gt; $DB-&gt;{workspace}{node_id}}). &quot; changes&quot;;
-  $str.=&quot;&lt;br&gt;&quot;.linkNode($NODE, &quot;Discard&quot;, { op =&gt; 'commitworkspace',
-       &quot;commit_$$NODE{node_id}&quot; =&gt; 'discard',
-       workspace_id =&gt; $DB-&gt;{workspace}{node_id}}). &quot; changes&quot;;
-}
-
-$str;
-
-%]</field>
-  <field name="otheraccess" type="literal_value">iiiii</field>
-  <field name="parent_container" type="noderef" type_nodetype="container,nodetype">general nodelet container</field>
-  <field name="title" type="literal_value">workspace info</field>
-  <field name="type_nodetype" type="noderef" type_nodetype="nodetype,nodetype">nodelet</field>
-  <field name="updateinterval" type="literal_value">0</field>
-</NODE>

Modified: trunk/ecore/nodes/nodeletgroup/all_nodelets.xml
===================================================================
--- trunk/ecore/nodes/nodeletgroup/all_nodelets.xml	2008-07-12 11:56:47 UTC (rev 1011)
+++ trunk/ecore/nodes/nodeletgroup/all_nodelets.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -6,7 +6,7 @@
   <field name="dynamicguest_permission" type="literal_value">-1</field>
   <field name="dynamicother_permission" type="literal_value">-1</field>
   <group>
-    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">admin nodelet</member>
+    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Admin Nodelet</member>
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">CGI::param</member>
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Server Statistics</member>
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Other Users</member>

Modified: trunk/ecore/nodes/nodeletgroup/default_nodelets.xml
===================================================================
--- trunk/ecore/nodes/nodeletgroup/default_nodelets.xml	2008-07-12 11:56:47 UTC (rev 1011)
+++ trunk/ecore/nodes/nodeletgroup/default_nodelets.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -11,7 +11,7 @@
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Other Users</member>
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">New Nodes</member>
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Links</member>
-    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">personal nodelet</member>
+    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Personal Nodelet</member>
   </group>
   <field name="group_usergroup" type="literal_value">-1</field>
   <field name="groupaccess" type="literal_value">iiii-</field>

Modified: trunk/ecore/nodes/nodeletgroup/system_nodelets.xml
===================================================================
--- trunk/ecore/nodes/nodeletgroup/system_nodelets.xml	2008-07-12 11:56:47 UTC (rev 1011)
+++ trunk/ecore/nodes/nodeletgroup/system_nodelets.xml	2008-09-05 11:00:17 UTC (rev 1012)
@@ -6,8 +6,8 @@
   <field name="dynamicguest_permission" type="literal_value">-1</field>
   <field name="dynamicother_permission" type="literal_value">-1</field>
   <group>
-    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">workspace info</member>
-    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">admin nodelet</member>
+    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Workspace Info</member>
+    <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Admin Nodelet</member>
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Node Bucket</member>
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Epicenter</member>
     <member name="group_node" type="noderef" type_nodetype="nodelet,nodetype">Node Statistics</member>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


