Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /cowiki/htdocs/tpl/africa/, /cowiki/htdocs/tpl/curare/, /cowiki/htdocs/tpl/default/, /cowiki/htdocs/tpl/spitsbergen/, /cowiki/includes/cowiki/plugin/

cowiki
Discussion topic

Back to topic list

CVS update: /cowiki/htdocs/tpl/africa/, /cowiki/htdocs/tpl/curare/, /cowiki/htdocs/tpl/default/, /cowiki/htdocs/tpl/spitsbergen/, /cowiki/includes/cowiki/plugin/

Author dgorski
Full name Daniel T. Gorski
Date 2005-09-12 18:47:25 PDT
Message User: dgorski
Date: 2005/09/12 18:47:25

Modified:
   cowiki/htdocs/tpl/af​rica/plugin.front.do​c.edit.tpl
   cowiki/htdocs/tpl/cu​rare/plugin.front.do​c.edit.tpl
   cowiki/htdocs/tpl/de​fault/plugin.front.d​oc.edit.tpl
   cowiki/htdocs/tpl/sp​itsbergen/plugin.fro​nt.doc.edit.tpl
   cowiki/includes/cowi​ki/plugin/class.Priv​ateFrontDocumentEdit​or.php

Log:
 Added "change log" input field for a short summary what a user has changed in a document

File Changes:

Directory: /cowiki/htdocs/tpl/africa/
====================​=================

File [changed]: plugin.front.doc.edit.tpl
Url: http://cowiki.tigris​.org/source/browse/c​owiki/htdocs/tpl/afr​ica/plugin.front.doc​.edit.tpl?r1=1.2​&r2=1.3
Delta lines: +16 -0
--------------------
--- plugin.front.doc.edit.tpl 15 Jan 2005 23:38:30 -0000 1.2
+++ plugin.front.doc.edit.tpl 13 Sep 2005 01:47:22 -0000 1.3
@@ -97,6 +97,22 @@
     </td>
   </tr>
 
+ {ifdefined %TPL_EDITING_EXISTIN​G_DOCUMENT%}
+ {* Separator *}
+ {include inc.window.tr.separa​tor.tuborg.tpl}
+
+ <tr>
+ <td style="padding: 0px 5px 0px 5px;">
+ <table cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td nowrap>{%I18N_DOC​_CHANGE_LOG%}:</t​d>
+ <td width="100%">{%TP​L_ITEM_CHANGELOG%}​</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ {/ifdefined}
+
   {* Separator *}
   {include inc.window.tr.separa​tor.tuborg.tpl}
 

Directory: /cowiki/htdocs/tpl/curare/
====================​=================

File [changed]: plugin.front.doc.edit.tpl
Url: http://cowiki.tigris​.org/source/browse/c​owiki/htdocs/tpl/cur​are/plugin.front.doc​.edit.tpl?r1=1.5​&r2=1.6
Delta lines: +16 -0
--------------------
--- plugin.front.doc.edit.tpl 15 Jan 2005 23:38:30 -0000 1.5
+++ plugin.front.doc.edit.tpl 13 Sep 2005 01:47:22 -0000 1.6
@@ -97,6 +97,22 @@
     </td>
   </tr>
 
+ {ifdefined %TPL_EDITING_EXISTIN​G_DOCUMENT%}
+ {* Separator *}
+ {include inc.window.tr.separa​tor.tuborg.tpl}
+
+ <tr>
+ <td style="padding: 0px 5px 0px 5px;">
+ <table cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td nowrap>{%I18N_DOC​_CHANGE_LOG%}:</t​d>
+ <td width="100%">{%TP​L_ITEM_CHANGELOG%}​</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ {/ifdefined}
+
   {* Separator *}
   {include inc.window.tr.separa​tor.tuborg.tpl}
 

Directory: /cowiki/htdocs/tpl/default/
====================​==================

File [changed]: plugin.front.doc.edit.tpl
Url: http://cowiki.tigris​.org/source/browse/c​owiki/htdocs/tpl/def​ault/plugin.front.do​c.edit.tpl?r1=1.10​&r2=1.11
Delta lines: +16 -0
--------------------
--- plugin.front.doc.edit.tpl 15 Jan 2005 23:38:30 -0000 1.10
+++ plugin.front.doc.edit.tpl 13 Sep 2005 01:47:22 -0000 1.11
@@ -97,6 +97,22 @@
     </td>
   </tr>
 
+ {ifdefined %TPL_EDITING_EXISTIN​G_DOCUMENT%}
+ {* Separator *}
+ {include inc.window.tr.separa​tor.tuborg.tpl}
+
+ <tr>
+ <td style="padding: 0px 5px 0px 5px;">
+ <table cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td nowrap>{%I18N_DOC​_CHANGE_LOG%}:</t​d>
+ <td width="100%">{%TP​L_ITEM_CHANGELOG%}​</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ {/ifdefined}
+
   {* Separator *}
   {include inc.window.tr.separa​tor.tuborg.tpl}
 

Directory: /cowiki/htdocs/tpl/spitsbergen/
====================​====================​==

File [changed]: plugin.front.doc.edit.tpl
Url: http://cowiki.tigris​.org/source/browse/c​owiki/htdocs/tpl/spi​tsbergen/plugin.fron​t.doc.edit.tpl?r1=1.​2&r2=1.3
Delta lines: +16 -0
--------------------
--- plugin.front.doc.edit.tpl 15 Jan 2005 23:38:30 -0000 1.2
+++ plugin.front.doc.edit.tpl 13 Sep 2005 01:47:22 -0000 1.3
@@ -97,6 +97,22 @@
     </td>
   </tr>
 
+ {ifdefined %TPL_EDITING_EXISTIN​G_DOCUMENT%}
+ {* Separator *}
+ {include inc.window.tr.separa​tor.tuborg.tpl}
+
+ <tr>
+ <td style="padding: 0px 5px 0px 5px;">
+ <table cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td nowrap>{%I18N_DOC​_CHANGE_LOG%}:</t​d>
+ <td width="100%">{%TP​L_ITEM_CHANGELOG%}​</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ {/ifdefined}
+
   {* Separator *}
   {include inc.window.tr.separa​tor.tuborg.tpl}
 

Directory: /cowiki/includes/cowiki/plugin/
====================​====================​==

File [changed]: class.PrivateFrontDo​cumentEditor.php
Url: http://cowiki.tigris​.org/source/browse/c​owiki/includes/cowik​i/plugin/class.Priva​teFrontDocumentEdito​r.php?r1=1.34&r2​=1.35
Delta lines: +21 -2
--------------------
--- class.PrivateFrontDo​cumentEditor.php 12 Sep 2005 20:05:50 -0000 1.34
+++ class.PrivateFrontDo​cumentEditor.php 13 Sep 2005 01:47:22 -0000 1.35
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.PrivateFrontDo​cumentEditor.php,v 1.34 2005/09/12 20:05:50 dgorski Exp $
+ * $Id: class.PrivateFrontDo​cumentEditor.php,v 1.35 2005/09/13 01:47:22 dgorski Exp $
  *
  * This file is part of coWiki. coWiki is free software under the terms of
  * the GNU General Public License (GPL). Read the LICENSE file. If you did
@@ -31,7 +31,7 @@
  * @author Daniel T. Gorski, <daniel.gorski@de​velnet.org>
  * @copyright (C) Daniel T. Gorski, {@link http://www.develnet.org}
  * @license http://www.gnu.org/l​icenses/gpl.html
- * @version $Revision: 1.34 $
+ * @version $Revision: 1.35 $
  *
  */
 
@@ -99,6 +99,11 @@
         $bSubmitted = false;
         $bCreateNew = $this->Request-​>get('cmd') == CMD_NEWDOC;
 
+ // Variable for later template flow control.
+ if (!$bCreateNew) {
+ $this->Template-​>set('TPL_EDITING​_EXISTING_DOCUMENT',​ true);
+ }
+
         // --------------------​--------------------​--------------------​----
 
         // Check user access.
@@ -130,6 +135,9 @@
             // Parse into raw coWiki representation
             $Edit->set('content', $RevParser->pars​e($Edit->get('co​ntent')));
 
+ // Reset the change log entry
+ $Edit->set('changelog', '');
+
         } else {
 
             // Create a new (empty) DocumentItem
@@ -183,6 +191,7 @@
 
                 $Edit->set('name', trim($this->Requ​est->get('name'))​);
                 $Edit->set('keywords', trim($this->Requ​est->get('keyword​s')));
+ $Edit->set('chan​gelog',trim($this-​>Request->get('​changelog')));
                 $Edit->set('content', $sContent);
 
                 // "Guest" must not change it
@@ -584,6 +593,16 @@
         $sStr .= '</textarea>';
 
         $this->Template-​>set('TPL_ITEM_CO​NTENT', $sStr);
+
+ // --------------------​--------------------​--------------------​----
+
+ // Document change log
+ $sStr = '<input type="text" name="changelog" size="40"';
+ $sStr .= ' style="width:100%"';
+ $sStr .= ' value="'.escape($Ed​it->get('changelo​g')).'"';
+ $sStr .= ' maxlength="255">';
+
+ $this->Template-​>set('TPL_ITEM_CH​ANGELOG', $sStr);
 
         // --------------------​--------------------​--------------------​----

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /cowiki/htdocs/tpl/africa/, /cowiki/htdocs/tpl/curare/, /cowiki/htdocs/tpl/default/, /cowiki/htdocs/tpl/spitsbergen/, /cowiki/includes/cowiki/plugin/ dgorski Daniel T. Gorski 2005-09-12 18:47:25 PDT
Messages per page: