[kde-services-devel] r545 - in trunk/commitfilter/web: . design

josef at new.kstuff.org josef at new.kstuff.org
Fri Jul 19 21:12:54 UTC 2013


Author: josef
Date: 2013-07-19 23:12:54 +0200 (Fri, 19 Jul 2013)
New Revision: 545

Added:
   trunk/commitfilter/web/addgit.inc
   trunk/commitfilter/web/addnavigationgit.inc
   trunk/commitfilter/web/design/top-kde.jpg
Modified:
   trunk/commitfilter/web/add.inc
   trunk/commitfilter/web/addhelp.inc
Log:
- maintenance sync with commitfilter.kde.org



Modified: trunk/commitfilter/web/add.inc
===================================================================
--- trunk/commitfilter/web/add.inc	2011-02-03 08:45:45 UTC (rev 544)
+++ trunk/commitfilter/web/add.inc	2013-07-19 21:12:54 UTC (rev 545)
@@ -40,8 +40,15 @@
 <?php
 
 $d = opendir("$rootdir/$dir");
+$dirs = array();
 while($x = readdir($d))
 {
+	$dirs[] = $x;
+}
+sort($dirs);
+
+foreach ($dirs as $x)
+{
 	if ($x == ".") continue;
 	if ($x == "CVS") continue;
 	if ($x == ".svn") continue;

Added: trunk/commitfilter/web/addgit.inc
===================================================================
--- trunk/commitfilter/web/addgit.inc	                        (rev 0)
+++ trunk/commitfilter/web/addgit.inc	2013-07-19 21:12:54 UTC (rev 545)
@@ -0,0 +1,70 @@
+<?php
+
+function parentdir($s)
+{
+	return ereg_replace("/[[:alnum:]\-]+/$", "/", $s);
+}
+
+$dir = $_GET['dir'];
+
+// FIXME: configuration hack
+$rootdir = "$conf_repodir/../kdegit";
+if (!$dir) :
+	$dir = "/";
+else :
+	$dir = str_replace("..", "", $dir);
+endif;
+
+include_once("addnavigationgit.inc");
+?>
+
+<?php table_start(); ?>
+
+<?php
+
+echo "Local git repositories in accordance with projects.kde.org<br>\n";
+if ($dir != "/") :
+	echo "<a href='index.php?page=detail&detail=$dir&add=$dir'>Add this directory: $dir</a><br>\n";
+endif;
+
+?>
+
+<?php table_stop(); ?>
+
+
+<?php table_start(); ?>
+
+<?php
+
+$d = opendir("$rootdir/$dir");
+$dirs = array();
+while($x = readdir($d))
+{
+	$dirs[] = $x;
+}
+sort($dirs);
+
+foreach ($dirs as $x)
+{
+	if ($x == ".") continue;
+	if ($x == "CVS") continue;
+	if ($x == ".svn") continue;
+	if ($x == ".git") continue;
+	if ($x == "..") :
+		if ($dir == "/") :
+			continue;
+		else :
+			$xdir = parentdir($dir);
+		endif;
+	else :
+		$xdir = "$dir$x/";
+	endif;
+	if(is_dir("$rootdir/$xdir")) :
+		echo "<a href='index.php?page=addgit&dir=$xdir'>$x</a><br>\n";
+	endif;
+}
+
+?>
+
+<?php table_stop(); ?>
+

Modified: trunk/commitfilter/web/addhelp.inc
===================================================================
--- trunk/commitfilter/web/addhelp.inc	2011-02-03 08:45:45 UTC (rev 544)
+++ trunk/commitfilter/web/addhelp.inc	2013-07-19 21:12:54 UTC (rev 545)
@@ -9,13 +9,13 @@
 <?php table_start(); ?>
 
 They way Commitfilter works is as follows: the user configures a set of directories, and/or a set of
-favourised SVN usernames, whose commits should get delivered to the inbox.
+favourised SVN/Git usernames, whose commits should get delivered to the inbox.
 In addition, each directory allows some customisation like whether to receive the associated i18n/doc
 mails for an application or if follow-up discussions should be considered too.
 <br><br>
-To find a directory name, browse the local directories (fast but due to SVN's size currently limited
-to kdelibs+kdebase), or browse the output of websvn, or enter the fully qualified path directly.
-To find a SVN username, simply watch out whose commit you'd like to see :)
+To find a directory name, browse the local directories (fast but due to SVN's/Git's size currently limited
+to a large subset of the repositories), or browse the output of websvn, or enter the fully qualified path directly.
+To find an SVN/Git username, simply watch out whose commit you'd like to see :)
 <br><br>
 Then, when the configuration is finished, the mail server setup takes care of the operational part.
 This means that the web frontend is only used for configuration, however the mail server implements

Added: trunk/commitfilter/web/addnavigationgit.inc
===================================================================
--- trunk/commitfilter/web/addnavigationgit.inc	                        (rev 0)
+++ trunk/commitfilter/web/addnavigationgit.inc	2013-07-19 21:12:54 UTC (rev 545)
@@ -0,0 +1,18 @@
+<?php table_start(); ?>
+
+<?php
+
+$local_root = "<a href='index.php?page=addgit&dir=/'>root</a>";
+$local_kde = "<a href='index.php?page=addgit&dir=/kde/kdelibs/'>kdelibs</a>";
+$manual = "<a href='index.php?page=addmanual'>all</a>";
+$help = "<a href='index.php?page=addhelp'>all</a>";
+
+echo "Add a directory to your filter by navigating the source repository.<br/>";
+echo "Shortcuts: Local git repositories ($local_root, $local_kde), ";
+echo "Manual addition ($manual)<br/>";
+echo "See also: How to add directories ($help)<br/>";
+
+?>
+
+<?php table_stop(); ?>
+

Added: trunk/commitfilter/web/design/top-kde.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/commitfilter/web/design/top-kde.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream



More information about the kde-services-devel mailing list