Thread: [Codestriker-commits] CVS update: codestriker/template/en/default createproject.html.tmpl createtopi
Brought to you by:
sits
From: <si...@us...> - 2004-11-21 05:00:28
|
Created Codestriker topic at: http://codestriker.sourceforge.net/cgi-bin/codestriker.pl?topic=232080&action=view&brmode=1&fview=-1 User: sits Date: 04/11/20 21:00:13 Modified: . CHANGELOG INFO.txt codestriker.conf bin checksetup.pl codestriker.pl.base doc codestriker.sgml lib/Codestriker/Action SubmitEditTopicProperties.pm SubmitEditTopicsState.pm template/en/default createproject.html.tmpl createtopic.html.tmpl editcomment.html.tmpl editproject.html.tmpl listprojects.html.tmpl listtopics.html.tmpl metricsreport.html.tmpl search.html.tmpl viewtopic.html.tmpl viewtopiccomments.html.tmpl viewtopicinfo.html.tmpl viewtopicproperties.html.tmpl Log: * The $allow_delete config variable has been removed. If topic deletion is to be enabled, the 'Deleted' state needs to be added to the @topic_states configuration variable in codestriker.conf. Updated manual and configuration file for all the new options for the 1.8.5 release. Updated help links. Index: CHANGELOG =================================================================== RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- CHANGELOG 17 Nov 2004 10:04:34 -0000 1.154 +++ CHANGELOG 21 Nov 2004 05:00:04 -0000 1.155 @@ -10,10 +10,16 @@ which allows you to create a new topic which superseeds the selected topics. The obsoleted topics will be changed to state "Obsoleted" and will become read-only. Note the @topic_states configuration - variable in codestriker.conf has been modified to include the new - 'Obsoleted' state. The view topic screens have been modified to - include links if the topic being viewed has been obsoleted or - superseeds other topics. + variable in codestriker.conf needs to be modified to include the new + 'Obsoleted' state to enable this. The view topic screens have been + modified to include links if the topic being viewed has been + obsoleted or superseeds other topics. A single topic can be + obsoleted from the view topic properties page, by selecting the + 'Obsoleted' state. + +* The $allow_delete config variable has been removed. If topic + deletion is to be enabled, the 'Deleted' state needs to be added to + the @topic_states configuration variable in codestriker.conf. * Added new configuration variable @Codestriker::exclude_file_types which contains a list of filename extensions which Codestriker will Index: INFO.txt =================================================================== RCS file: /cvsroot/codestriker/codestriker/INFO.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- INFO.txt 18 Sep 2004 00:54:18 -0000 1.6 +++ INFO.txt 21 Nov 2004 05:00:04 -0000 1.7 @@ -13,6 +13,12 @@ drop table topicusermetric; drop table topicviewhistory; +drop sequence sequence; +drop trigger commentstate_id_ins_row; +drop trigger project_id_ins_row; + + + In commitinfo: # Run this to prepare for log_accum.pl in loginfo Index: codestriker.conf =================================================================== RCS file: /cvsroot/codestriker/codestriker/codestriker.conf,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- codestriker.conf 17 Nov 2004 10:04:34 -0000 1.66 +++ codestriker.conf 21 Nov 2004 05:00:04 -0000 1.67 @@ -1,11 +1,11 @@ # -*-perl-*- # Configuration file for codestriker.pl. -# Database to use for storing codestriker data. Examples given are Postgresql -# and MySQL +# Database to use for storing codestriker data. Examples given are +# Oracle, SQL Server, PostgreSQL and MySQL. #$db = 'DBI:Oracle:host=127.0.0.1;sid=local'; #$db = 'DBI:ODBC:Codestriker'; -#$db = 'DBI:Pg:dbname=codestrikerdb2'; +#$db = 'DBI:Pg:dbname=codestrikerdb'; $db = 'DBI:mysql:dbname=codestrikerdb'; # Database user. @@ -34,12 +34,12 @@ #$cvs = 'c:/Program Files/GNU/WinCvs 1.3/CVSNT/cvs.exe'; $cvs = '/usr/bin/cvs'; -# Location of the ssh binary. This is only required if a CVS :ext type is -# used. +# Location of the ssh binary. This is only required if a CVS :ext +# type repository is used. $ssh = '/usr/local/bin/ssh'; # Location of the p4 (Perforce client) binary. This does not need to be set -# if you are using any perforce repositories. +# if you are bot using any Perforce repositories. $p4 = '/usr/local/bin/p4'; # Location of the vss binary. This can be ignored for deployments which don't @@ -67,56 +67,87 @@ #$bugtracker = 'http://localhost.localdomain/show_bug.cgi?id='; # Valid repositories which may be selected at the create topic screen. -# The order shown here is the order presented in the option list. The -# first example is the CVSROOT of a CVS repository on the same machine -# as the codestriker server. The second is an example of a CVS -# repository which contains the URL to a viewcvs installation (CVS web -# is also supported), followed by the CVSROOT of the repository. The -# next example is the syntax used for specifying a Subversion repository, -# which is simply the subversion repository URL prefixed by svn: If your -# subversion server requires authentication, then the user name and -# passwords should be added to the end and separated by semicolons. -# -# The next three examples are for pserver repositories. The full -# username, password, hostname and repository form must be used here. -# Typically, this would be set to an anonymous user. The 2nd example -# shows that some of the extra pserver settings can be used. The last -# example shows the setting for an anonymous pserver setting with no -# password. -# -# The next examples are a VSS repository, and some CVS repositories on -# a Win32 system. -# -# The final example is for a Perforce repository. After the leading -# :perforce identifier, the next two components are the Perforce -# user and client parameters. The last two parameters after the '@' -# symbol represent the host and port number of the Perforce server. +# The order shown here is the order presented in the option list. Most +# deployments will only require a single repository to be specified. +# Comment out / modify entries appropriate for your deployment. # # If this list is empty it won't be possible to view the entire contents of a # file before the proposed change and/or after. All of the places # in the application that ask for, or display repository information will # be hidden and lastly, it will be impossible to make a diff review topic # on files that already checked in. -# -# On some servers (such as sourceforge), the firewall doesn't allow CGI -# scripts to make remote connections. - @valid_repositories = ( + # Example CVSROOT of a CVS repository on the same machine as the + # codestriker server. '/home/sits/cvs', + + # Example of a CVS repository which contains the URL to a viewcvs + # installation (CVS web is also supported), followed by the + # CVSROOT of the repository. 'http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi /cvsroot', + + # The next example is the syntax used for specifying a Subversion + # repository, which is simply the subversion repository URL + # prefixed # by svn: 'svn:http://svn.collab.net/repos/svn/trunk', + + # Subversion server with authentication. The user name and + # password should be added to the end and separated by + # semicolons. 'svn:http://svn.collab.net/repos/svn/trunk;username;password', + + # Example CVS pserver config with username and password + # specified. ':pserver:sits:pas...@cv...:/cvsroot', + + # Example CVS pserver config with proxy options. ':pserver;proxy=abc.com;proxyport=8080:sits:pw...@cv...', + + # Example CVS pserver with empty password. ':pserver:anonymous:@cvs.sourceforge.net:/cvsroot', + + # Example CVS server which will be connected to with SSH. This + # assumes the appropriate ssh keys have been created so that the + # process running the Codestriker application can connect to the + # CVS server without requiring a password to be entered. ':ext:sits@localhost:/home/sits/cvs', + + # Visual SourceSafe repository on same machine at default + # location. Username "admin", password "password". 'vss:admin;password', + + # Visual SourceSafe repository on same machine, but with specific + # repository location specified. 'vss:c:\\Program Files\\Microsoft Visual Studio\\VSS;admin;password', + + # Visual SourceSafe repository located on a network fileshare. 'vss:\\\\VisualSourceSafeMachineName\\SharedRepositoryPath;admin;password', + # Example Win32 CVS repository on the same machine. ':local:c:\\cvsrep', + + # Another Win32 CVS repository on the same machine. 'c:/cvsrep2', + + # The next example is for a Perforce repository. After the + # leading :perforce identifier, the next two components are the + # Perforce user and client parameters. The last two parameters + # after the '@' symbol represent the host and port number of + # the Perforce server. 'perforce:sits:sits2@localhost:1666', + + # The final example is a ClearCase repository, where the path is + # the location of a shared snapshot view. From this view, it + # should be possible to a file of any version can be + # retrieved from the vob using the "cleartool get" command. It + # is important that this snapshot view is accessible with the + # same path specification for all developers. This is because + # a diff file created by a developer will refer to the snapshot + # view, and will allow Codestriker to retrieve specific files + # and versions mentioned in the review text, when necessary. + # It is also important that the user account running the + # webserver process has permission to access to the snapshot + # view. 'clearcase:c:\\stuff\\view_name\\vob_name' ); @@ -193,12 +224,9 @@ # There is no problem added new states dynamically, or changing the textual # names. Note, the initial topic state must be the first element. If # the 'Obsoleted' state is removed, then it will not be possible to obsolete -# topics. -@topic_states = ('Open', 'Closed', 'Committed', 'Obsoleted'); - -# Indicate if topics can be deleted. Turning this to false can be useful for -# "anonymous" installations of codestriker. -$allow_delete = 1; +# topics. If the 'Deleted' state is removed, then it will not be possible +# to delete topics. +@topic_states = ('Open', 'Closed', 'Committed', 'Obsoleted', 'Deleted'); # Indicate if topics can be listed/searched. Turning this to false can be # useful for "anonymous" installations of codestriker. Index: checksetup.pl =================================================================== RCS file: /cvsroot/codestriker/codestriker/bin/checksetup.pl,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- checksetup.pl 1 Nov 2004 09:04:25 -0000 1.60 +++ checksetup.pl 21 Nov 2004 05:00:06 -0000 1.61 @@ -151,12 +151,13 @@ return $vok; } +# Determine if this process is running under Windows, as the installation +# process is slightly different. +my $osname = $Config{'osname'}; +my $windows = (defined $osname && $osname eq "MSWin32") ? 1 : 0; + # Output any modules which may be missing. if (%missing) { - # Determine if this process is running under Windows, as the installation - # process is different. - my $osname = $Config{'osname'}; - my $windows = (defined $osname && $osname eq "MSWin32") ? 1 : 0; # First, output the generic "missing module" message. print "\n\n"; @@ -925,6 +926,14 @@ || die "Unable to open codestriker.pl.base file: $!"; open(CODESTRIKER_PL, ">../cgi-bin/codestriker.pl") || die "Unable to create ../cgi-bin/codestriker.pl file: $!"; + +# For Win32, don't enable tainting mode. There are weird issues with +# ActivePerl, and sometimes with IIS as well. +if ($windows) { + print CODESTRIKER_PL '#!perl.exe -w' . "\n"; +} else { + print CODESTRIKER_PL '#!/usr/bin/perl -w' . "\n"; +} my $codestriker_lib = 'use lib \'' . cwd() . '/../lib\';'; for (my $i = 0; <CODESTRIKER_BASE>; $i++) { Index: codestriker.pl.base =================================================================== RCS file: /cvsroot/codestriker/codestriker/bin/codestriker.pl.base,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- codestriker.pl.base 27 Sep 2004 22:55:09 -0000 1.13 +++ codestriker.pl.base 21 Nov 2004 05:00:07 -0000 1.14 @@ -1,4 +1,3 @@ -#!/usr/bin/perl -wT # -*-perl-*- ############################################################################### Index: codestriker.sgml =================================================================== RCS file: /cvsroot/codestriker/codestriker/doc/codestriker.sgml,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- codestriker.sgml 3 Nov 2004 20:48:33 -0000 1.41 +++ codestriker.sgml 21 Nov 2004 05:00:07 -0000 1.42 @@ -7,7 +7,7 @@ <book> <bookinfo> <title>The Codestriker Guide</title> - <subtitle>Version 1.8.4</subtitle> + <subtitle>Version 1.8.5</subtitle> <legalnotice> <para>Copyright (c) 2001, 2002, 2003, 2004</para> </legalnotice> @@ -40,8 +40,14 @@ </para> <para> Special support is provided for integration with - <ulink url="http://cvshome.org">CVS</ulink> and - <ulink url="http://subversion.tigris.org">Subversion</ulink> + <ulink url="http://cvshome.org">CVS</ulink>, + <ulink url="http://subversion.tigris.org">Subversion</ulink>, + <ulink url="http://www.perforce.com">Perforce</ulink>, + <ulink + url="http://www.rational.com/products/clearcase">ClearCase</ulink> + and + <ulink + url="http://msdn.microsoft.com/ssafe">Visual SourceSafe</ulink>. source control management systems, for the display of coloured diffs and for the ability to view original and new files in their entirety to assist in the review process. @@ -54,7 +60,7 @@ process. </para> <para> - Codestriker is written in Perl in a cross-platform style. It + Codestriker is written in cross-platform Perl. It can run on any variant of UNIX (Linux, *BSD) and has been deployed on Win32 systems (Windows 98 and above). It can be used in conjunction with a number of relational databases, @@ -274,21 +280,19 @@ Codestriker has been deployed using SQL Server, via the ODBC interface. The first step is to create a "Codestriker" system data source, by going to "Control Panel" -> - "Administrative Tools" -> "Data Sources (ODBC)". - From here, select the "System DSN" tab, and click "Add". - Select the driver named "SQL Server", then click "Finish". - Enter in "Codestriker" for the name textfield, "Codestriker - database" for the description textfield, and select the - appropriate SQL Server from the server dropdown box, - then click "Next". Choose the authentication appropriate - for your site, and work your way through the final - configuration options. Install the DBD::ODBC Perl module, - modify the <varname>$db</varname> variable in the - <filename>codestriker.conf</filename> file appropriately so - that Codestriker knows how to connect to this datasource. An - example is given in the configuration file. For more - advanced connection strings, please consult the DBD::ODBC - man page. + "Administrative Tools" -> "Data Sources (ODBC)". From here, + select the "System DSN" tab, and click "Add". Select the + driver named "SQL Server", then click "Finish". Enter in + "Codestriker" for the name textfield, "Codestriker database" + for the description textfield, and select the appropriate + SQL Server from the server dropdown box, then click "Next". + Choose the authentication appropriate for your site, and + work your way through the final configuration options. + Modify the <varname>$db</varname> variable in the + <filename>codestriker.conf</filename> file appropriately + (see the example) so that Codestriker knows how to connect + to this datasource. For more advanced connection settings, + please consult the DBD::ODBC man page or online manual. </para> </sect2> <sect2> @@ -366,6 +370,8 @@ # Database password. $dbpasswd = 'cspasswd'; </programlisting> + Other examples for other database systems are present in the + configuration file. </para> </sect2> @@ -419,91 +425,94 @@ file). For many Codestriker deployments, there may only be a single SCM system. There is currently support for CVS, Subversion, Perforce, Visual Source Safe, and ClearCase. - An example setting could be the following: + Here are examples from the codestriker.conf file: <programlisting> +# Valid repositories which may be selected at the create topic screen. +# The order shown here is the order presented in the option list. Most +# deployments will only require a single repository to be specified. +# Comment out / modify entries appropriate for your deployment. +# +# If this list is empty it won't be possible to view the entire contents of a +# file before the proposed change and/or after. All of the places +# in the application that ask for, or display repository information will +# be hidden and lastly, it will be impossible to make a diff review topic +# on files that already checked in. @valid_repositories = ( + # Example CVSROOT of a CVS repository on the same machine as the + # codestriker server. '/home/sits/cvs', + + # Example of a CVS repository which contains the URL to a viewcvs + # installation (CVS web is also supported), followed by the + # CVSROOT of the repository. 'http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi /cvsroot', + + # The next example is the syntax used for specifying a Subversion + # repository, which is simply the subversion repository URL + # prefixed # by svn: 'svn:http://svn.collab.net/repos/svn/trunk', - ':pserver:anonymous:pas...@cv...:/cvsroot', - 'c:/cvsrep', - 'perforce:sits:client@localhost:1666', - 'clearcase:h:\\my_stuff\\view_name\\vob_name' + + # Subversion server with authentication. The user name and + # password should be added to the end and separated by + # semicolons. + 'svn:http://svn.collab.net/repos/svn/trunk;username;password', + + # Example CVS pserver config with username and password + # specified. + ':pserver:sits:pas...@cv...:/cvsroot', + + # Example CVS pserver config with proxy options. + ':pserver;proxy=abc.com;proxyport=8080:sits:pw...@cv...', + + # Example CVS pserver with empty password. + ':pserver:anonymous:@cvs.sourceforge.net:/cvsroot', + + # Example CVS server which will be connected to with SSH. This + # assumes the appropriate ssh keys have been created so that the + # process running the Codestriker application can connect to the + # CVS server without requiring a password to be entered. + ':ext:sits@localhost:/home/sits/cvs', + + # Visual SourceSafe repository on same machine at default + # location. Username "admin", password "password". + 'vss:admin;password', + + # Visual SourceSafe repository on same machine, but with specific + # repository location specified. + 'vss:c:\\Program Files\\Microsoft Visual Studio\\VSS;admin;password', + + # Visual SourceSafe repository located on a network fileshare. + 'vss:\\\\VisualSourceSafeMachineName\\SharedRepositoryPath;admin;password', + # Example Win32 CVS repository on the same machine. + ':local:c:\\cvsrep', + + # Another Win32 CVS repository on the same machine. + 'c:/cvsrep2', + + # The next example is for a Perforce repository. After the + # leading :perforce identifier, the next two components are the + # Perforce user and client parameters. The last two parameters + # after the '@' symbol represent the host and port number of + # the Perforce server. + 'perforce:sits:sits2@localhost:1666', + + # The final example is a ClearCase repository, where the path is + # the location of a shared snapshot view. From this view, it + # should be possible to a file of any version can be + # retrieved from the vob using the "cleartool get" command. It + # is important that this snapshot view is accessible with the + # same path specification for all developers. This is because + # a diff file created by a developer will refer to the snapshot + # view, and will allow Codestriker to retrieve specific files + # and versions mentioned in the review text, when necessary. + # It is also important that the user account running the + # webserver process has permission to access to the snapshot + # view. + 'clearcase:c:\\stuff\\view_name\\vob_name' ); - </programlisting> - This is Perl syntax for a list of string values. The first - value indicates a CVS repository on the same machine as - Codestriker, which has a CVSROOT of - <filename>/home/sits/cvs</filename>. - </para> - <para> - If you have ViewCVS installed on your site, Codestriker can - use it directly for CVS information, if CVS is not installed - on the same machine. The second value - <filename>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi /cvsroot</filename> - contain the base URL for accessing ViewCVS, and the second - part contains the CVSROOT value of this repository, which is - <filename>/cvsroot</filename>. - </para> - <para> - Codestriker can also work with other source control systems. - There is currently support for CVS, Subversion (<ulink - url="http://subversion.tigris.org">http://subversion.tigris.org</ulink>), - Perforce (<ulink - url="http://www.perforce.com/">http://www.perforce.com/</ulink>), - Visual Source Safe (<ulink - url="msdn.microsoft.com/ssafe/">msdn.microsoft.com/ssafe/</ulink>) - and ClearCase. In the future other SCM systems will become - available depending on demand and contributions. The third - string - <filename>svn:http://svn.collab.net/repos/svn/trunk</filename> - is a Subversion repository URL prefixed by - "svn:". Codestriker works with both http style repositories, - and the stand alone Subversion server. The Subversion - repository can be located on another computer than the one - running Codestriker. - </para> - <para> - The next value which is likely to be common for many - deployments is an anonymous CVS pserver specification. The - string is actually in the same form as a CVS pserver URL. - Note you can also use the :ext method with SSH, if the user - running the Codestriker application has the ability to - connect to the CVS server via SSH (see the configuration - file for an example). For more information of setting up - anonymous pserver access, please consult the CVS manual. - Note if your anonymous account does not have a password, the - setting would be (note the colons): - <programlisting> - ':pserver:anonymous:@cvs.sourceforge.net:/cvsroot' - </programlisting> - </para> - <para> - The next value is an example of a CVS repository located on - a Win32 system. Note that forward slashes are still used as - a directory separator. - </para> - <para> - The next value is a Perforce repository specification, - where after the "perforce:" keyword, there is the Perforce - user and client, followed by the hostname and port of the - Perforce server. - </para> - <para> - The final value is a ClearCase repository specification, - where after the "clearcase:" keyword, is the pathname to a - shared snapshot view, where a file of any version can be - retrieved from the vob using the "cleartool get" command. - It is important that this snapshot view is accessible with - the same path specification for all developers. This is - because a diff file created by a developer will refer to the - snapshot view, and will allow Codestriker to retrieve - specific files and versions mentioned in the review text, - when necessary. It is also important that the user account - running the webserver process has permission to access to - the snapshot view. - </para> + </programlisting> + </para> <para> During a review, it is sometimes beneficial to see the revision history of a file, such as information provided by @@ -520,7 +529,7 @@ revision information can be found using the URL specified. </para> <para> - Finally, if you are using CVS, please make sure the + If you are using CVS, make sure the <varname>$cvs</varname> setting is set to the correct path. For UNIX, this is likely to be something like: <programlisting> @@ -537,6 +546,14 @@ setting filenames, you should always use forward slashes.</emphasis> </para> + <para> + If you are using Perforce, make sure the + <varname>$p4</varname> setting is set to the correct path. + </para> + <para> + If you are using Visual SourceSafe, make sure the + <varname>$vss</varname> setting is set to the correct path. + </para> </sect2> <sect2> <title>Bug-Tracking Integration</title> @@ -699,10 +716,6 @@ 'tif', 'tiff', 'xbm', 'fnt', 'ttf', 'pfm', 'pfb', 'eps', 'wpj', 'sxi'); -# Indicate if topics can be deleted. Turning this to false can be useful for -# "anonymous" installations of codestriker. -$allow_delete = 1; - # Indicate if topics can be listed/searched. Turning this to false can be # useful for "anonymous" installations of Codestriker. $allow_searchlist = 1; @@ -966,24 +979,6 @@ data migrations. </para> <para> - For Window systems, edit the first line from the files - <filename>bin/checksetup.pl</filename> and - <filename>bin/codestriker.pl.base</filename>. For example, if - you have Perl installed in <filename>c:\perl\perl</filename>, - then the first line of <filename>bin/checksetup.pl</filename> - should look like: -<programlisting> -#!c:/perl/perl -w -</programlisting> - The first line of <filename>bin/codestriker.pl.base</filename> - should look like: -<programlisting> -#!c:/perl/perl -w -</programlisting> - <emphasis>Note the use of forward slashes. Also note the -T - flag must be removed for Win32 users, due to very obscure reasons.</emphasis> - </para> - <para> Perl is available by default for all UNIX systems. For Windows, you can download it for free from <ulink url="http://www.activestate.com/Products/Download/Download.plex?id=ActivePerl">http://www.activestate.com/Products/Download/Download.plex?id=ActivePerl</ulink>. @@ -998,7 +993,7 @@ For Windows, you need to do something like the following from the command prompt: <programlisting> -% cd c:\codestriker\bin +% cd c:\codestriker\install\location\bin % checksetup.pl </programlisting> </para> Index: SubmitEditTopicProperties.pm =================================================================== RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/SubmitEditTopicProperties.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- SubmitEditTopicProperties.pm 9 Nov 2004 21:01:10 -0000 1.9 +++ SubmitEditTopicProperties.pm 21 Nov 2004 05:00:08 -0000 1.10 @@ -37,9 +37,7 @@ my $projectid = $http_input->get('projectid'); # Check if this action is allowed, and that the state is valid. - if ($Codestriker::allow_delete == 0 && $topic_state eq "Delete") { - $http_response->error("This function has been disabled"); - } elsif (! grep /^$topic_state$/, @Codestriker::topic_states) { + if (! grep /^$topic_state$/, @Codestriker::topic_states) { $http_response->error("Topic state $topic_state unrecognised"); } @@ -83,7 +81,7 @@ } if ($feedback eq "") { - if ($topic_state eq "Delete") { + if ($topic_state eq "Deleted") { $rc = $topic->delete(); if ($rc == $Codestriker::INVALID_TOPIC) { $feedback .= "Topic no longer exists.\n"; @@ -128,7 +126,7 @@ $feedback =~ s/\n/<BR>/g; $http_input->{feedback} = $feedback; if ($rc == $Codestriker::INVALID_TOPIC || - ($rc == $Codestriker::OK && $topic_state eq "Delete")) { + ($rc == $Codestriker::OK && $topic_state eq "Deleted")) { if ($Codestriker::allow_searchlist) { # Go to the topic list screen for just open topics. $http_input->{sstate} = "0"; Index: SubmitEditTopicsState.pm =================================================================== RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/SubmitEditTopicsState.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SubmitEditTopicsState.pm 17 Oct 2004 22:32:41 -0000 1.6 +++ SubmitEditTopicsState.pm 21 Nov 2004 05:00:08 -0000 1.7 @@ -38,7 +38,7 @@ } # The main topic list page does not allow deletes, so block this out. - if ($topic_state eq "Delete") { + if ($topic_state eq "Deleted") { $http_response->error("This function has been disabled"); } Index: createproject.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/createproject.html.tmpl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- createproject.html.tmpl 21 Sep 2004 22:22:09 -0000 1.17 +++ createproject.html.tmpl 21 Nov 2004 05:00:10 -0000 1.18 @@ -1,6 +1,6 @@ [%# Screen for the create project form. #%] -[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x362.html" %] +[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x350.html" %] [%# Display any "feedback" to the user if necessary. #%] [% IF feedback != '' %] Index: createtopic.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/createtopic.html.tmpl,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- createtopic.html.tmpl 17 Nov 2004 10:04:40 -0000 1.38 +++ createtopic.html.tmpl 21 Nov 2004 05:00:10 -0000 1.39 @@ -1,6 +1,6 @@ [%# Screen for the create topic form. #%] -[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x386.html" %] +[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x374.html" %] [%# Display any "feedback" to the user if necessary. #%] [% IF feedback != '' %] Index: editcomment.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/editcomment.html.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- editcomment.html.tmpl 30 Sep 2004 10:27:09 -0000 1.11 +++ editcomment.html.tmpl 21 Nov 2004 05:00:10 -0000 1.12 @@ -97,7 +97,7 @@ [% USE AutomagicLinks %] -[% PROCESS header.html.tmpl displaymenu = 0 version = version help = "x484.html#ADD-COMMENT" %] +[% PROCESS header.html.tmpl displaymenu = 0 version = version help = "x473.html#ADD-COMMENT" %] <table border="0" cellpadding="5" cellspacing="0" width="100%"> <tr class="tlh"> Index: editproject.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/editproject.html.tmpl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- editproject.html.tmpl 30 Sep 2004 10:27:09 -0000 1.17 +++ editproject.html.tmpl 21 Nov 2004 05:00:10 -0000 1.18 @@ -1,6 +1,6 @@ [%# Screen for the edit project form. #%] -[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x362.html" %] +[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x350.html" %] <script language="JavaScript"> Index: listprojects.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/listprojects.html.tmpl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- listprojects.html.tmpl 18 Sep 2004 00:54:20 -0000 1.15 +++ listprojects.html.tmpl 21 Nov 2004 05:00:10 -0000 1.16 @@ -1,6 +1,6 @@ [%# Display a list of projects #%] -[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x362.html" %] +[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x350.html" %] [%# Display any "feedback" to the user if necessary. #%] [% IF feedback != '' %] Index: listtopics.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/listtopics.html.tmpl,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- listtopics.html.tmpl 18 Oct 2004 23:43:58 -0000 1.29 +++ listtopics.html.tmpl 21 Nov 2004 05:00:10 -0000 1.30 @@ -1,6 +1,6 @@ [%# Screen for show a list of topics. #%] -[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x335.html" %] +[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x319.html" %] [%# Display any "feedback" to the user if necessary. #%] [% IF feedback != '' %] Index: metricsreport.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/metricsreport.html.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- metricsreport.html.tmpl 30 Sep 2004 10:27:09 -0000 1.9 +++ metricsreport.html.tmpl 21 Nov 2004 05:00:10 -0000 1.10 @@ -1,6 +1,6 @@ [%# Screen for the metrics report. #%] -[% PROCESS header.html.tmpl version = version displaymenu = 1 help ="x673.html" %] +[% PROCESS header.html.tmpl version = version displaymenu = 1 help ="x662.html" %] <!-- "" --> Index: search.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/search.html.tmpl,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- search.html.tmpl 30 Sep 2004 10:27:09 -0000 1.23 +++ search.html.tmpl 21 Nov 2004 05:00:10 -0000 1.24 @@ -1,6 +1,6 @@ [%# Screen for search topics. #%] -[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x637.html" %] +[% PROCESS header.html.tmpl version = version displaymenu = 1 help = "x626.html" %] <H1>Topic search</H1> Index: viewtopic.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopic.html.tmpl,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- viewtopic.html.tmpl 30 Sep 2004 10:27:09 -0000 1.28 +++ viewtopic.html.tmpl 21 Nov 2004 05:00:10 -0000 1.29 @@ -4,7 +4,7 @@ customised. #%] [% PROCESS viewtopicheader.html.tmpl version = version - help = "x484.html#VIEW-TOPIC" topicview = 1 topicproperties = 0 + help = "x473.html#VIEW-TOPIC" topicview = 1 topicproperties = 0 topiccomments = 0 topicinfo = 0 %] <p> Index: viewtopiccomments.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopiccomments.html.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- viewtopiccomments.html.tmpl 30 Sep 2004 10:27:09 -0000 1.14 +++ viewtopiccomments.html.tmpl 21 Nov 2004 05:00:10 -0000 1.15 @@ -3,7 +3,7 @@ [% USE AutomagicLinks %] [% PROCESS viewtopicheader.html.tmpl version = version - help = "x583.html" topicview = 0 topicproperties = 0 topiccomments = 1 + help = "x572.html" topicview = 0 topicproperties = 0 topiccomments = 1 topicinfo = 0 %] <SCRIPT language="JavaScript"> Index: viewtopicinfo.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopicinfo.html.tmpl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- viewtopicinfo.html.tmpl 30 Sep 2004 10:27:09 -0000 1.15 +++ viewtopicinfo.html.tmpl 21 Nov 2004 05:00:10 -0000 1.16 @@ -4,7 +4,7 @@ [% PROCESS viewtopicheader.html.tmpl version = version topicview = 0 topicproperties = 0 topiccomments = 0 topicinfo = 1 - help = "x618.html" %] + help = "x607.html" %] [%# Create a form to allow the topic's metrics to be changed #%] [% SET metric_input_exists = 0 %] Index: viewtopicproperties.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopicproperties.html.tmpl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- viewtopicproperties.html.tmpl 9 Nov 2004 21:01:16 -0000 1.13 +++ viewtopicproperties.html.tmpl 21 Nov 2004 05:00:10 -0000 1.14 @@ -5,7 +5,7 @@ [% PROCESS viewtopicheader.html.tmpl version = version topicview = 0 topiccomments = 0 topicinfo = 0 topicproperties = 1 - help = "x605.html" %] + help = "x594.html" %] <script language="JavaScript"> <!-- @@ -20,7 +20,7 @@ var stateSelection = document.form.topic_state.options[stateIndex].value; // Confirm with the user if they are deleting. - if (stateSelection == 'Delete') + if (stateSelection == 'Deleted') { return confirm('This topic and all of its comments will be ' + 'permanently removed. Are you sure you want ' + @@ -214,14 +214,12 @@ [% FOREACH state = states %] [% IF state == default_state %] <option selected value="[% state %]">[% state %]</option> + [% ELSIF state == 'Deleted' %] + <option value="Deleted">Delete Topic ... </option> [% ELSE %] <option value="[% state %]">[% state %]</option> [% END %] [% END %] - [%# Render a "delete" button, for deleting topics, if enabled #%] - [% IF delete_enabled != 0 %] - <option value="Delete">Delete Topic ... </option> - [% END %] </select> </td> </tr> |
From: <si...@us...> - 2005-05-23 11:55:02
|
Created Codestriker topic at: http://codestriker.sourceforge.net/cgi-bin/codestriker.pl?topic=8215076&action=view User: sits Date: 05/05/23 04:54:02 Modified: template/en/default createproject.html.tmpl createtopic.html.tmpl editcomment.html.tmpl editproject.html.tmpl listprojects.html.tmpl listtopics.html.tmpl metricsreport.html.tmpl search.html.tmpl viewtopic.html.tmpl viewtopiccomments.html.tmpl viewtopicinfo.html.tmpl viewtopicproperties.html.tmpl Log: Updated help links. Index: createproject.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/createproject.html.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- createproject.html.tmpl 21 Feb 2005 11:25:28 -0000 1.19 +++ createproject.html.tmpl 23 May 2005 11:54:00 -0000 1.20 @@ -1,7 +1,7 @@ [%# Screen for the create project form. #%] [% PROCESS header.html.tmpl version = version displaymenu = 1 - closehead = 1 help = "x350.html" %] + closehead = 1 help = "x355.html" %] [%# Display any "feedback" to the user if necessary. #%] [% IF feedback != '' %] Index: createtopic.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/createtopic.html.tmpl,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- createtopic.html.tmpl 21 Feb 2005 11:25:29 -0000 1.41 +++ createtopic.html.tmpl 23 May 2005 11:54:00 -0000 1.42 @@ -1,7 +1,7 @@ [%# Screen for the create topic form. #%] [% PROCESS header.html.tmpl version = version displaymenu = 1 - closehead = 1 help = "x374.html" %] + closehead = 1 help = "x379.html" %] [%# Display any "feedback" to the user if necessary. #%] [% IF feedback != '' %] Index: editcomment.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/editcomment.html.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- editcomment.html.tmpl 14 Feb 2005 09:43:49 -0000 1.19 +++ editcomment.html.tmpl 23 May 2005 11:54:00 -0000 1.20 @@ -132,7 +132,7 @@ [%# Screen for the add comment form. #%] -[% PROCESS header.html.tmpl displaymenu = 0 version = version help = "x483.html#ADD-COMMENT" %] +[% PROCESS header.html.tmpl displaymenu = 0 version = version help = "x488.html#ADD-COMMENT" %] <table border="0" cellpadding="5" cellspacing="0" width="100%"> <tr class="tlh"> Index: editproject.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/editproject.html.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- editproject.html.tmpl 21 Feb 2005 11:25:30 -0000 1.19 +++ editproject.html.tmpl 23 May 2005 11:54:00 -0000 1.20 @@ -1,7 +1,7 @@ [%# Screen for the edit project form. #%] [% PROCESS header.html.tmpl version = version displaymenu = 1 - closehead = 1 help = "x350.html" %] + closehead = 1 help = "x355.html" %] <script language="JavaScript"> Index: listprojects.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/listprojects.html.tmpl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- listprojects.html.tmpl 21 Feb 2005 11:25:30 -0000 1.17 +++ listprojects.html.tmpl 23 May 2005 11:54:00 -0000 1.18 @@ -1,7 +1,7 @@ [%# Display a list of projects #%] [% PROCESS header.html.tmpl version = version displaymenu = 1 - closehead = 1 help = "x350.html" %] + closehead = 1 help = "x355.html" %] [%# Display any "feedback" to the user if necessary. #%] [% IF feedback != '' %] Index: listtopics.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/listtopics.html.tmpl,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- listtopics.html.tmpl 21 Feb 2005 11:25:30 -0000 1.33 +++ listtopics.html.tmpl 23 May 2005 11:54:00 -0000 1.34 @@ -1,7 +1,7 @@ [%# Screen for show a list of topics. #%] [% PROCESS header.html.tmpl version = version displaymenu = 1 - closehead = 1 help = "x319.html" %] + closehead = 1 help = "x324.html" %] [%# Display any "feedback" to the user if necessary. #%] [% IF feedback != '' %] Index: metricsreport.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/metricsreport.html.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- metricsreport.html.tmpl 21 Feb 2005 11:25:30 -0000 1.12 +++ metricsreport.html.tmpl 23 May 2005 11:54:00 -0000 1.13 @@ -1,7 +1,7 @@ [%# Screen for the metrics report. #%] [% PROCESS header.html.tmpl version = version displaymenu = 1 - closehead = 1 help ="x672.html" %] + closehead = 1 help ="x676.html" %] <!-- "" --> Index: search.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/search.html.tmpl,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- search.html.tmpl 21 Feb 2005 11:25:31 -0000 1.27 +++ search.html.tmpl 23 May 2005 11:54:00 -0000 1.28 @@ -1,7 +1,7 @@ [%# Screen for search topics. #%] [% PROCESS header.html.tmpl version = version displaymenu = 1 - closehead = 1 help = "x636.html" %] + closehead = 1 help = "x640.html" %] <H1>Topic search</H1> Index: viewtopic.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopic.html.tmpl,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- viewtopic.html.tmpl 1 Mar 2005 10:12:53 -0000 1.32 +++ viewtopic.html.tmpl 23 May 2005 11:54:00 -0000 1.33 @@ -8,7 +8,7 @@ customised. #%] [% PROCESS viewtopicheader.html.tmpl version = version - help = "x483.html#VIEW-TOPIC" topicview = 1 topicproperties = 0 + help = "x488.html#VIEW-TOPIC" topicview = 1 topicproperties = 0 topiccomments = 0 topicinfo = 0 closehead = 0 %] <p> Index: viewtopiccomments.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopiccomments.html.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- viewtopiccomments.html.tmpl 22 May 2005 11:26:30 -0000 1.20 +++ viewtopiccomments.html.tmpl 23 May 2005 11:54:00 -0000 1.21 @@ -3,7 +3,7 @@ [% USE AutomagicLinks %] [% PROCESS viewtopicheader.html.tmpl version = version - help = "x582.html" topicview = 0 topicproperties = 0 topiccomments = 1 + help = "x586.html" topicview = 0 topicproperties = 0 topiccomments = 1 topicinfo = 0 closehead = 1 %] <SCRIPT language="JavaScript"> Index: viewtopicinfo.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopicinfo.html.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- viewtopicinfo.html.tmpl 21 Feb 2005 11:25:32 -0000 1.18 +++ viewtopicinfo.html.tmpl 23 May 2005 11:54:00 -0000 1.19 @@ -4,7 +4,7 @@ [% PROCESS viewtopicheader.html.tmpl version = version topicview = 0 topicproperties = 0 topiccomments = 0 topicinfo = 1 closehead = 1 - help = "x617.html" %] + help = "x621.html" %] [%# Create a form to allow the topic's metrics to be changed #%] [% SET metric_input_exists = 0 %] Index: viewtopicproperties.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopicproperties.html.tmpl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- viewtopicproperties.html.tmpl 22 May 2005 11:26:30 -0000 1.17 +++ viewtopicproperties.html.tmpl 23 May 2005 11:54:00 -0000 1.18 @@ -5,7 +5,7 @@ [% PROCESS viewtopicheader.html.tmpl version = version topicview = 0 topiccomments = 0 topicinfo = 0 topicproperties = 1 closehead = 1 - help = "x604.html" %] + help = "x608.html" %] <script language="JavaScript"> <!-- |