Changed the dir structure so it looks a bit more distro-like.

diff --git a/Gitalist/Changes b/Changes
similarity index 100%
rename from Gitalist/Changes
rename to Changes

diff --git a/Gitalist/README b/Gitalist/README
deleted file mode 100644 (file)
index 6c59e16..0000000
--- a/Gitalist/README
+++ /dev/null
@@ -1 +0,0 @@
-Run script/gitalist_server.pl to test the application.

diff --git a/Gitalist/Makefile.PL b/Makefile.PL
similarity index 100%
rename from Gitalist/Makefile.PL
rename to Makefile.PL

diff --git a/git-favicon.png b/git-favicon.png
deleted file mode 100644 (file)
index de637c0..0000000
Binary files a/git-favicon.png and /dev/null differ

diff --git a/git-logo.png b/git-logo.png
deleted file mode 100644 (file)
index 16ae8d5..0000000
Binary files a/git-logo.png and /dev/null differ

diff --git a/Gitalist/gitalist.conf b/gitalist.conf
similarity index 100%
rename from Gitalist/gitalist.conf
rename to gitalist.conf

diff --git a/gitweb.conf b/gitweb.conf
index 2a5f992..3412a74 100644 (file)
--- a/gitweb.conf
+++ b/gitweb.conf
@@ -8,7 +8,7 @@ $git_temp = "/tmp";
 #$home_link = $my_uri || "/";
 
 # caption on top of pages
-$home_link_str = "Venda Git Repos";
+$home_link_str = "Git Repos";
 
 # html text to include at home page
 $home_text = "indextext.html";

diff --git a/gitweb.css b/gitweb.css
deleted file mode 100644 (file)
index 446a1c3..0000000
--- a/gitweb.css
+++ /dev/null
@@ -1,501 +0,0 @@
-body {
-       font-family: sans-serif;
-       font-size: small;
-       border: solid #d9d8d1;
-       border-width: 1px;
-       margin: 10px;
-       background-color: #ffffff;
-       color: #000000;
-}
-
-a {
-       color: #0000cc;
-}
-
-a:hover, a:visited, a:active {
-       color: #880000;
-}
-
-span.cntrl {
-       border: dashed #aaaaaa;
-       border-width: 1px;
-       padding: 0px 2px 0px 2px;
-       margin:  0px 2px 0px 2px;
-}
-
-img.logo {
-       float: right;
-       border-width: 0px;
-}
-
-div.page_header {
-       height: 25px;
-       padding: 8px;
-       font-size: 150%;
-       font-weight: bold;
-       background-color: #d9d8d1;
-}
-
-div.page_header a:visited, a.header {
-       color: #0000cc;
-}
-
-div.page_header a:hover {
-       color: #880000;
-}
-
-div.page_nav {
-       padding: 8px;
-}
-
-div.page_nav a:visited {
-       color: #0000cc;
-}
-
-div.page_path {
-       padding: 8px;
-       font-weight: bold;
-       border: solid #d9d8d1;
-       border-width: 0px 0px 1px;
-}
-
-div.page_footer {
-       height: 17px;
-       padding: 4px 8px;
-       background-color: #d9d8d1;
-}
-
-div.page_footer_text {
-       float: left;
-       color: #555555;
-       font-style: italic;
-}
-
-div.page_body {
-       padding: 8px;
-       font-family: monospace;
-}
-
-div.title, a.title {
-       display: block;
-       padding: 6px 8px;
-       font-weight: bold;
-       background-color: #edece6;
-       text-decoration: none;
-       color: #000000;
-}
-
-div.readme {
-       padding: 8px;
-}
-
-a.title:hover {
-       background-color: #d9d8d1;
-}
-
-div.title_text {
-       padding: 6px 0px;
-       border: solid #d9d8d1;
-       border-width: 0px 0px 1px;
-       font-family: monospace;
-}
-
-div.log_body {
-       padding: 8px 8px 8px 150px;
-}
-
-span.age {
-       position: relative;
-       float: left;
-       width: 142px;
-       font-style: italic;
-}
-
-span.signoff {
-       color: #888888;
-}
-
-div.log_link {
-       padding: 0px 8px;
-       font-size: 70%;
-       font-family: sans-serif;
-       font-style: normal;
-       position: relative;
-       float: left;
-       width: 136px;
-}
-
-div.list_head {
-       padding: 6px 8px 4px;
-       border: solid #d9d8d1;
-       border-width: 1px 0px 0px;
-       font-style: italic;
-}
-
-div.author_date {
-       padding: 8px;
-       border: solid #d9d8d1;
-       border-width: 0px 0px 1px 0px;
-       font-style: italic;
-}
-
-a.list {
-       text-decoration: none;
-       color: #000000;
-}
-
-a.subject, a.name {
-       font-weight: bold;
-}
-
-table.tags a.subject {
-       font-weight: normal;
-}
-
-a.list:hover {
-       text-decoration: underline;
-       color: #880000;
-}
-
-a.text {
-       text-decoration: none;
-       color: #0000cc;
-}
-
-a.text:visited {
-       text-decoration: none;
-       color: #880000;
-}
-
-a.text:hover {
-       text-decoration: underline;
-       color: #880000;
-}
-
-table {
-       padding: 8px 4px;
-       border-spacing: 0;
-}
-
-table.diff_tree {
-       font-family: monospace;
-}
-
-table.combined.diff_tree th {
-       text-align: center;
-}
-
-table.combined.diff_tree td {
-       padding-right: 24px;
-}
-
-table.combined.diff_tree th.link,
-table.combined.diff_tree td.link {
-       padding: 0px 2px;
-}
-
-table.combined.diff_tree td.nochange a {
-       color: #6666ff;
-}
-
-table.combined.diff_tree td.nochange a:hover,
-table.combined.diff_tree td.nochange a:visited {
-       color: #d06666;
-}
-
-table.blame {
-       border-collapse: collapse;
-}
-
-table.blame td {
-       padding: 0px 5px;
-       font-size: 100%;
-       vertical-align: top;
-}
-
-th {
-       padding: 2px 5px;
-       font-size: 100%;
-       text-align: left;
-}
-
-tr.light:hover {
-       background-color: #edece6;
-}
-
-tr.dark {
-       background-color: #f6f6f0;
-}
-
-tr.dark2 {
-       background-color: #f6f6f0;
-}
-
-tr.dark:hover {
-       background-color: #edece6;
-}
-
-td {
-       padding: 2px 5px;
-       font-size: 100%;
-       vertical-align: top;
-}
-
-td.link, td.selflink {
-       padding: 2px 5px;
-       font-family: sans-serif;
-       font-size: 70%;
-}
-
-td.selflink {
-       padding-right: 0px;
-}
-
-td.sha1 {
-       font-family: monospace;
-}
-
-td.error {
-       color: red;
-       background-color: yellow;
-}
-
-td.current_head {
-       text-decoration: underline;
-}
-
-table.diff_tree span.file_status.new {
-       color: #008000;
-}
-
-table.diff_tree span.file_status.deleted {
-       color: #c00000;
-}
-
-table.diff_tree span.file_status.moved,
-table.diff_tree span.file_status.mode_chnge {
-       color: #777777;
-}
-
-table.diff_tree span.file_status.copied {
-  color: #70a070;
-}
-
-/* noage: "No commits" */
-table.project_list td.noage {
-       color: #808080;
-       font-style: italic;
-}
-
-/* age2: 60*60*24*2 <= age */
-table.project_list td.age2, table.blame td.age2 {
-       font-style: italic;
-}
-
-/* age1: 60*60*2 <= age < 60*60*24*2 */
-table.project_list td.age1 {
-       color: #009900;
-       font-style: italic;
-}
-
-table.blame td.age1 {
-       color: #009900;
-       background: transparent;
-}
-
-/* age0: age < 60*60*2 */
-table.project_list td.age0 {
-       color: #009900;
-       font-style: italic;
-       font-weight: bold;
-}
-
-table.blame td.age0 {
-       color: #009900;
-       background: transparent;
-       font-weight: bold;
-}
-
-td.pre, div.pre, div.diff {
-       font-family: monospace;
-       font-size: 12px;
-       white-space: pre;
-}
-
-td.mode {
-       font-family: monospace;
-}
-
-/* styling of diffs (patchsets): commitdiff and blobdiff views */
-div.diff.header,
-div.diff.extended_header {
-       white-space: normal;
-}
-
-div.diff.header {
-       font-weight: bold;
-
-       background-color: #edece6;
-
-       margin-top: 4px;
-       padding: 4px 0px 2px 0px;
-       border: solid #d9d8d1;
-       border-width: 1px 0px 1px 0px;
-}
-
-div.diff.header a.path {
-       text-decoration: underline;
-}
-
-div.diff.extended_header,
-div.diff.extended_header a.path,
-div.diff.extended_header a.hash {
-       color: #777777;
-}
-
-div.diff.extended_header .info {
-       color: #b0b0b0;
-}
-
-div.diff.extended_header {
-       background-color: #f6f5ee;
-       padding: 2px 0px 2px 0px;
-}
-
-div.diff a.list,
-div.diff a.path,
-div.diff a.hash {
-       text-decoration: none;
-}
-
-div.diff a.list:hover,
-div.diff a.path:hover,
-div.diff a.hash:hover {
-       text-decoration: underline;
-}
-
-div.diff.to_file a.path,
-div.diff.to_file {
-       color: #007000;
-}
-
-div.diff.add {
-       color: #008800;
-}
-
-div.diff.from_file a.path,
-div.diff.from_file {
-       color: #aa0000;
-}
-
-div.diff.rem {
-       color: #cc0000;
-}
-
-div.diff.chunk_header a,
-div.diff.chunk_header {
-       color: #990099;
-}
-
-div.diff.chunk_header {
-       border: dotted #ffe0ff;
-       border-width: 1px 0px 0px 0px;
-       margin-top: 2px;
-}
-
-div.diff.chunk_header span.chunk_info {
-       background-color: #ffeeff;
-}
-
-div.diff.chunk_header span.section {
-       color: #aa22aa;
-}
-
-div.diff.incomplete {
-       color: #cccccc;
-}
-
-div.diff.nodifferences {
-       font-weight: bold;
-       color: #600000;
-}
-
-div.index_include {
-       border: solid #d9d8d1;
-       border-width: 0px 0px 1px;
-       padding: 12px 8px;
-}
-
-div.search {
-       font-size: 100%;
-       font-weight: normal;
-       margin: 4px 8px;
-       float: right;
-       top: 56px;
-       right: 12px
-}
-
-td.linenr {
-       text-align: right;
-}
-
-a.linenr {
-       color: #999999;
-       text-decoration: none
-}
-
-a.rss_logo {
-       float: right;
-       padding: 3px 0px;
-       width: 35px;
-       line-height: 10px;
-       border: 1px solid;
-       border-color: #fcc7a5 #7d3302 #3e1a01 #ff954e;
-       color: #ffffff;
-       background-color: #ff6600;
-       font-weight: bold;
-       font-family: sans-serif;
-       font-size: 70%;
-       text-align: center;
-       text-decoration: none;
-}
-
-a.rss_logo:hover {
-       background-color: #ee5500;
-}
-
-span.refs span {
-       padding: 0px 4px;
-       font-size: 70%;
-       font-weight: normal;
-       border: 1px solid;
-       background-color: #ffaaff;
-       border-color: #ffccff #ff00ee #ff00ee #ffccff;
-}
-
-span.refs span.ref {
-       background-color: #aaaaff;
-       border-color: #ccccff #0033cc #0033cc #ccccff;
-}
-
-span.refs span.tag {
-       background-color: #ffffaa;
-       border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
-}
-
-span.refs span.head {
-       background-color: #aaffaa;
-       border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
-}
-
-span.atnight {
-       color: #cc0000;
-}
-
-span.match {
-       color: #e00000;
-}
-
-div.binary {
-       font-style: italic;
-}

diff --git a/Gitalist/lib/Gitalist.pm b/lib/Gitalist.pm
similarity index 96%
rename from Gitalist/lib/Gitalist.pm
rename to lib/Gitalist.pm
index 173a1fc..7538376 100644 (file)
--- a/Gitalist/lib/Gitalist.pm
+++ b/lib/Gitalist.pm
@@ -19,6 +19,9 @@ use Catalyst qw/-Debug
                 Static::Simple/;
 our $VERSION = '0.01';
 
+# Bring in the libified gitweb.cgi.
+use gitweb;
+
 # Configure the application.
 #
 # Note that settings in gitalist.conf (or other external
@@ -36,8 +39,6 @@ __PACKAGE__->config(
 # Start the application
 __PACKAGE__->setup();
 
-require '/var/www/cgi-bin/gitalist/gitweb.cgi';
-
 =head1 NAME
 
 Gitalist - Catalyst based application

diff --git a/Gitalist/lib/Gitalist/Controller/Root.pm b/lib/Gitalist/Controller/Root.pm
similarity index 100%
rename from Gitalist/lib/Gitalist/Controller/Root.pm
rename to lib/Gitalist/Controller/Root.pm

diff --git a/Gitalist/lib/Gitalist/View/Default.pm b/lib/Gitalist/View/Default.pm
similarity index 100%
rename from Gitalist/lib/Gitalist/View/Default.pm
rename to lib/Gitalist/View/Default.pm

diff --git a/gitweb.cgi b/lib/gitweb.pm
similarity index 99%
rename from gitweb.cgi
rename to lib/gitweb.pm
index 16d52b1..6aaabd4 100755 (executable)
--- a/gitweb.cgi
+++ b/lib/gitweb.pm
@@ -17,6 +17,7 @@ use Encode;
 use Fcntl ':mode';
 use File::Find qw();
 use File::Basename qw(basename);
+use FindBin;
 binmode STDOUT, ':utf8';
 
 BEGIN {
@@ -428,7 +429,7 @@ sub main {
        if (-e $GITWEB_CONFIG) {
                do $GITWEB_CONFIG;
        } else {
-               our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || '../../gitweb.conf';
+               our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "$FindBin::Bin/../gitweb.conf";
                do $GITWEB_CONFIG_SYSTEM if -e $GITWEB_CONFIG_SYSTEM;
        }
 

diff --git a/Gitalist/root/favicon.ico b/root/favicon.ico
similarity index 100%
rename from Gitalist/root/favicon.ico
rename to root/favicon.ico

diff --git a/Gitalist/root/favicon.png b/root/favicon.png
similarity index 100%
rename from Gitalist/root/favicon.png
rename to root/favicon.png

diff --git a/Gitalist/root/git-favicon.png b/root/git-favicon.png
similarity index 100%
rename from Gitalist/root/git-favicon.png
rename to root/git-favicon.png

diff --git a/Gitalist/root/git-logo.png b/root/git-logo.png
similarity index 100%
rename from Gitalist/root/git-logo.png
rename to root/git-logo.png

diff --git a/Gitalist/root/gitweb.css b/root/gitweb.css
similarity index 100%
rename from Gitalist/root/gitweb.css
rename to root/gitweb.css

diff --git a/Gitalist/root/static/images/btn_120x50_built.png b/root/static/images/btn_120x50_built.png
similarity index 100%
rename from Gitalist/root/static/images/btn_120x50_built.png
rename to root/static/images/btn_120x50_built.png

diff --git a/Gitalist/root/static/images/btn_120x50_built_shadow.png b/root/static/images/btn_120x50_built_shadow.png
similarity index 100%
rename from Gitalist/root/static/images/btn_120x50_built_shadow.png
rename to root/static/images/btn_120x50_built_shadow.png

diff --git a/Gitalist/root/static/images/btn_120x50_powered.png b/root/static/images/btn_120x50_powered.png
similarity index 100%
rename from Gitalist/root/static/images/btn_120x50_powered.png
rename to root/static/images/btn_120x50_powered.png

diff --git a/Gitalist/root/static/images/btn_120x50_powered_shadow.png b/root/static/images/btn_120x50_powered_shadow.png
similarity index 100%
rename from Gitalist/root/static/images/btn_120x50_powered_shadow.png
rename to root/static/images/btn_120x50_powered_shadow.png

diff --git a/Gitalist/root/static/images/btn_88x31_built.png b/root/static/images/btn_88x31_built.png
similarity index 100%
rename from Gitalist/root/static/images/btn_88x31_built.png
rename to root/static/images/btn_88x31_built.png

diff --git a/Gitalist/root/static/images/btn_88x31_built_shadow.png b/root/static/images/btn_88x31_built_shadow.png
similarity index 100%
rename from Gitalist/root/static/images/btn_88x31_built_shadow.png
rename to root/static/images/btn_88x31_built_shadow.png

diff --git a/Gitalist/root/static/images/btn_88x31_powered.png b/root/static/images/btn_88x31_powered.png
similarity index 100%
rename from Gitalist/root/static/images/btn_88x31_powered.png
rename to root/static/images/btn_88x31_powered.png

diff --git a/Gitalist/root/static/images/btn_88x31_powered_shadow.png b/root/static/images/btn_88x31_powered_shadow.png
similarity index 100%
rename from Gitalist/root/static/images/btn_88x31_powered_shadow.png
rename to root/static/images/btn_88x31_powered_shadow.png

diff --git a/Gitalist/root/static/images/catalyst_logo.png b/root/static/images/catalyst_logo.png
similarity index 100%
rename from Gitalist/root/static/images/catalyst_logo.png
rename to root/static/images/catalyst_logo.png

diff --git a/Gitalist/script/gitalist_cgi.pl b/script/gitalist_cgi.pl
similarity index 100%
rename from Gitalist/script/gitalist_cgi.pl
rename to script/gitalist_cgi.pl

diff --git a/Gitalist/script/gitalist_create.pl b/script/gitalist_create.pl
similarity index 100%
rename from Gitalist/script/gitalist_create.pl
rename to script/gitalist_create.pl

diff --git a/Gitalist/script/gitalist_fastcgi.pl b/script/gitalist_fastcgi.pl
similarity index 100%
rename from Gitalist/script/gitalist_fastcgi.pl
rename to script/gitalist_fastcgi.pl

diff --git a/Gitalist/script/gitalist_server.pl b/script/gitalist_server.pl
similarity index 100%
rename from Gitalist/script/gitalist_server.pl
rename to script/gitalist_server.pl

diff --git a/Gitalist/script/gitalist_test.pl b/script/gitalist_test.pl
similarity index 100%
rename from Gitalist/script/gitalist_test.pl
rename to script/gitalist_test.pl

diff --git a/Gitalist/t/01app.t b/t/01app.t
similarity index 100%
rename from Gitalist/t/01app.t
rename to t/01app.t

diff --git a/Gitalist/t/02pod.t b/t/02pod.t
similarity index 100%
rename from Gitalist/t/02pod.t
rename to t/02pod.t

diff --git a/Gitalist/t/03podcoverage.t b/t/03podcoverage.t
similarity index 100%
rename from Gitalist/t/03podcoverage.t
rename to t/03podcoverage.t

diff --git a/Gitalist/t/view_Default.t b/t/view_Default.t
similarity index 100%
rename from Gitalist/t/view_Default.t
rename to t/view_Default.t

diff --git a/Gitalist/templates/default.tt2 b/templates/default.tt2
similarity index 100%
rename from Gitalist/templates/default.tt2
rename to templates/default.tt2

diff --git a/Gitalist/templates/page_nav.tt2 b/templates/page_nav.tt2
similarity index 100%
rename from Gitalist/templates/page_nav.tt2
rename to templates/page_nav.tt2