Permalink
Browse files

Merge branch 'cleanup-defaults'

  • Loading branch information...
abh committed Jun 27, 2011
2 parents 725a262 + a8c9c90 commit fe8ac6e72acb0d9399005f7a65614ab6bad3d9e2
Showing with 529 additions and 1,169 deletions.
  1. +2 −0 .gitignore
  2. +6 −6 README.md
  3. +6 −0 apache/conf/sites/static.tmpl
  4. +1 −1 combust
  5. +6 −6 docs/com/download/index.html
  6. +9 −129 docs/com/tpl/defaults
  7. +15 −0 docs/com/tpl/nav_tabs.html
  8. +34 −0 docs/com/tpl/quick_links_3
  9. +4 −107 docs/dbi/tpl/defaults
  10. +19 −0 docs/dbi/tpl/nav_tabs.html
  11. +11 −0 docs/dbi/tpl/quick_links_3
  12. +2 −2 docs/dev/perl6/index.html
  13. +0 −105 docs/dev/tpl/defaults
  14. +12 −0 docs/dev/tpl/nav_tabs.html
  15. BIN docs/ldap/Knuellpap.jpg
  16. +11 −15 docs/ldap/index.html
  17. +0 −67 docs/ldap/site.css
  18. +12 −9 docs/ldap/tpl/defaults
  19. +7 −0 docs/ldap/tpl/quick_links_1
  20. +2 −0 docs/ldap/tpl/quick_links_2
  21. +0 −25 docs/ldap/tpl/sidebar.html
  22. +0 −116 docs/ldap/tpl/style/default.html
  23. +0 −106 docs/learn/tpl/defaults
  24. +14 −0 docs/learn/tpl/nav_tabs.html
  25. +8 −0 docs/learn/tpl/sponsor.html
  26. +0 −124 docs/lists/tpl/defaults
  27. +33 −0 docs/lists/tpl/nav_tabs.html
  28. +0 −90 docs/qa/tpl/defaults
  29. +12 −0 docs/qa/tpl/nav_tabs.html
  30. +6 −0 docs/qa/tpl/quick_links_3
  31. +5 −0 docs/shared/nav_tabs
  32. +0 −1 docs/shared/static
  33. +2 −0 docs/shared/tpl/nav_tabs.html
  34. +15 −0 docs/shared/tpl/quick_link_creator
  35. +22 −0 docs/shared/tpl/quick_links_1
  36. +17 −0 docs/shared/tpl/quick_links_2
  37. +19 −0 docs/shared/tpl/quick_links_3
  38. 0 docs/{www → shared}/tpl/sponsor-rotato.html
  39. +1 −0 docs/shared/tpl/sponsor.html
  40. +5 −9 docs/shared/tpl/style/leo.html
  41. +13 −0 docs/shared/tpl/tip
  42. +1 −1 docs/{com/css/site.css → static/css/com.css}
  43. +17 −0 docs/static/css/ldap.css
  44. +1 −1 docs/{learn/css/site.css → static/css/learn.css}
  45. +6 −6 docs/static/css/leostyle.css
  46. +84 −0 docs/static/css/www.css
  47. BIN docs/{shared/i → static/images}/arrow_grey.gif
  48. BIN docs/{shared/i → static/images}/icons/cal.png
  49. BIN docs/{shared/i → static/images}/icons/camel.png
  50. BIN docs/{shared/i → static/images}/icons/cog.png
  51. BIN docs/{shared/i → static/images}/icons/community.png
  52. BIN docs/{shared/i → static/images}/icons/cpan.png
  53. BIN docs/{shared/i → static/images}/icons/cross.png
  54. BIN docs/{shared/i → static/images}/icons/docs.png
  55. BIN docs/{shared/i → static/images}/icons/download.png
  56. BIN docs/{shared/i → static/images}/icons/download_arrow.gif
  57. BIN docs/{shared/i → static/images}/icons/info.png
  58. BIN docs/{shared/i → static/images}/icons/learn.png
  59. BIN docs/{shared/i → static/images}/icons/onion.png
  60. BIN docs/{shared/i → static/images}/icons/perl6.png
  61. BIN docs/{shared/i → static/images}/icons/rss.png
  62. BIN docs/{shared/i → static/images}/icons/star.png
  63. BIN docs/{shared/i → static/images}/icons/tick.png
  64. BIN docs/{shared/i → static/images}/logos/linux.gif
  65. BIN docs/{shared/i → static/images}/logos/mac.gif
  66. BIN docs/{shared/i → static/images}/logos/windows.gif
  67. BIN docs/{shared/i → static/images}/masthead/camel/camel_bg.gif
  68. BIN docs/{shared/i → static/images}/shadow_line.jpg
  69. +16 −22 docs/static/js/leo.js
  70. +2 −0 docs/static/tpl/style/default.html
  71. +0 −84 docs/www/css/site.css
  72. +9 −9 docs/www/get.html
  73. +8 −8 docs/www/index.html
  74. +0 −120 docs/www/tpl/defaults
  75. +27 −0 docs/www/tpl/nav_tabs.html
  76. +8 −0 docs/www/tpl/sponsor.html
  77. +19 −0 lib/PerlOrg/Control/CSS.pm
View
@@ -17,6 +17,8 @@ cover_db/
pm_to_blib
blib/
+logs/
+
combust.conf
combust.conf.testing
View
@@ -6,20 +6,20 @@ Sites moved to new perlweb:
- dbi
- debugger
- dev
-- noc
-- qa
-
-Sites still running on old perlweb:
-
- ldap
- learn
- lists
+- noc
- perl4lib
+- qa
- sdl
-- svnaccount
- www
- xml
+Sites still running on old perlweb:
+
+- svnaccount
+
## Clone the source
@@ -9,4 +9,10 @@
PerlHandler PerlOrg::Control::Basic
</Location>
+ <Location /css/>
+ SetHandler perl-script
+ PerlHandler PerlOrg::Control::CSS
+ </Location>
+
+
</VirtualHost>
@@ -68,15 +68,15 @@ <h3>
<table class="download_table highlight" cellspacing="0" cellpadding="0" width="100%">
<tr class="download_logos">
<th>Operating system</th>
- <td><img src="/i/logos/linux.gif" class="logo" alt="Unix like..." />Unix like</td>
- <td><img src="/i/logos/mac.gif" class="logo" alt="Mac" />Mac OS X</td>
- <td><img src="/i/logos/windows.gif" class="logo" alt="Windows" />Windows</td>
+ <td><img src="[% combust.static_url("/images/logos/linux.gif") %]" class="logo" alt="Unix like..." />Unix like</td>
+ <td><img src="[% combust.static_url("/images/logos/mac.gif") %]" class="logo" alt="Mac" />Mac OS X</td>
+ <td><img src="[% combust.static_url("/images/logos/windows.gif") %]" class="logo" alt="Windows" />Windows</td>
</tr>
<tr>
<th>Installed?</th>
- <td><img src="/i/icons/tick.png" alt="Included" /> Included</td>
- <td><img src="/i/icons/tick.png" alt="Included" /> Included</td>
- <td><img src="/i/icons/download_arrow.gif" alt="Download Needed"
+ <td><img src="[% combust.static_url("/images/icons/tick.png") %]" alt="Included" /> Included</td>
+ <td><img src="[% combust.static_url("/images/icons/tick.png") %]" alt="Included" /> Included</td>
+ <td><img src="[% combust.static_url("/images/icons/download_arrow.gif") %]" alt="Download Needed"
/> Download Needed</td>
</tr>
</table>
View
@@ -16,6 +16,15 @@
brand => 'com',
};
PROCESS tpl/stats.html;
+
+ page.import({
+ quick_links_1_title => 'Find out more',
+ quick_links_1_list => [
+ '<a href="http://perldoc.perl.org">Documentation</a>',
+ '<a href="http://www.perl.org/">Community: Perl.org</a>',
+ '<a href="http://blogs.perl.org/">Perl Blogs</a>',
+ ],
+ });
SET section_data = {
quick_links_2_title => 'Technical Showcases',
@@ -27,134 +36,5 @@
],
};
-%]
-[%- BLOCK nav_tabs %]
-<ul>
- <li[% ' class="selected"' IF page.section == 'home' %]>
- <a href="/">Home</a>
- </li>
- <li class="[% ' selected' IF page.section == 'download' %]">
- <a href="/download/">Download</a>
- </li>
- <li class="[% ' selected' IF page.section == 'events' %]">
- <a href="/events.html">Events</a>
- </li>
- <li class="[% ' selected' IF page.section == 'articles' %]">
- <a href="/articles/">Articles</a>
- </li>
-
-</ul>
-[% END -%]
-
-[%- BLOCK quick_link_creator %]
-[%-
- IF quick_link_list.size == 0;
- RETURN;
- END;
--%]
-<div class="quick_links">
- <h4 class="round">
- [% quick_link_title %]
- </h4>
- <div class="list">
- [% FOREACH p = quick_link_list %]
- <p>[% p %]</p>
- [% END %]
- </div>
-</div>
-[% END -%]
-[%- BLOCK tip %][% UNLESS tip; RETURN; END; %]
-<div class="quick_links">
- <h4 class="round">
- Tip
- </h4>
- <div class="list">
- <p>
- <strong>[% tip.title %]</strong>
- [% tip.desc %]
- </p>
- </div>
-</div>
-[% END -%]
-
-[%- BLOCK quick_links_1;
-
- SET source = {
- quick_links_1_title => 'Find out more',
- quick_links_1_list => [
- '<a href="http://perldoc.perl.org">Documentation</a>',
- '<a href="http://www.perl.org/">Community: Perl.org</a>',
- '<a href="http://blogs.perl.org/">Perl Blogs</a>',
- ],
- };
-
- IF page.quick_links_1_title;
- source = page;
- ELSIF section_data && section_data.quick_links_1_title;
- source = section_data;
- END;
-
- IF source.quick_links_1_title;
- PROCESS quick_link_creator
- quick_link_title => source.quick_links_1_title,
- quick_link_list => source.quick_links_1_list;
- END;
--%]
-[% END -%]
-[%- BLOCK quick_links_2;
-
- SET source = {};
-
- IF page.quick_links_2_title;
- source = page;
- ELSIF section_data && section_data.quick_links_2_title;
- source = section_data;
- END;
-
- IF source.quick_links_2_title;
- PROCESS quick_link_creator
- quick_link_title => source.quick_links_2_title,
- quick_link_list => source.quick_links_2_list;
- END;
--%]
-[% END -%]
-[%- BLOCK quick_links_3 %]
-
-[%
- asins = [
- '1430223650', # The Definitive Guide to Catalyst
- '1558607013', # Higher-Order Perl
- '1884777791', # Object Oriented Perl
- '0596004761', # Template Toolkit
- '0596001738', # Perl Best Practices
- '0596520107' # Learning Perl
- ];
-%]
-
-[% rand_idx = asins.size.rand %]
-[% asin = asins.$rand_idx %]
-
-<div class="quick_links dbi_book">
- <h4 class="round">
- Sponsor
- </h4>
- <div class="list">
- <p><a href="http://training.perl.com/">Perl Training</a></p>
- </div>
-
-
-<div class="quick_links dbi_book">
- <h4 class="round">
- Perl Books
- </h4>
- <div class="list">
- <p align="center">
- <iframe align="center" src="http://rcm.amazon.com/e/cm?lt1=_blank&bc1=FFFFFF&IS2=1&bg1=FFFFFF&fc1=000000&lc1=0000FF&t=develooper&o=1&p=8&l=as1&m=amazon&f=ifr&asins=[% asin %]" style="width:120px;height:240px;" scrolling="no" marginwidth="0" marginheight="0" frameborder="0"></iframe>
- </p>
- </div>
-</div>
-
-
-
-[% END -%]
[% PROCESS tpl/quicknews %]
View
@@ -0,0 +1,15 @@
+<ul>
+ <li[% ' class="selected"' IF page.section == 'home' %]>
+ <a href="/">Home</a>
+ </li>
+ <li class="[% ' selected' IF page.section == 'download' %]">
+ <a href="/download/">Download</a>
+ </li>
+ <li class="[% ' selected' IF page.section == 'events' %]">
+ <a href="/events.html">Events</a>
+ </li>
+ <li class="[% ' selected' IF page.section == 'articles' %]">
+ <a href="/articles/">Articles</a>
+ </li>
+
+</ul>
View
@@ -0,0 +1,34 @@
+[%
+ asins = [
+ '1430223650', # The Definitive Guide to Catalyst
+ '1558607013', # Higher-Order Perl
+ '1884777791', # Object Oriented Perl
+ '0596004761', # Template Toolkit
+ '0596001738', # Perl Best Practices
+ '0596520107' # Learning Perl
+ ];
+%]
+
+[% rand_idx = asins.size.rand %]
+[% asin = asins.$rand_idx %]
+
+<div class="quick_links dbi_book">
+ <h4 class="round">
+ Sponsor
+ </h4>
+ <div class="list">
+ <p><a href="http://training.perl.com/">Perl Training</a></p>
+ </div>
+
+
+<div class="quick_links dbi_book">
+ <h4 class="round">
+ Perl Books
+ </h4>
+ <div class="list">
+ <p align="center">
+ <iframe align="center" src="http://rcm.amazon.com/e/cm?lt1=_blank&bc1=FFFFFF&IS2=1&bg1=FFFFFF&fc1=000000&lc1=0000FF&t=develooper&o=1&p=8&l=as1&m=amazon&f=ifr&asins=[% asin %]" style="width:120px;height:240px;" scrolling="no" marginwidth="0" marginheight="0" frameborder="0"></iframe>
+ </p>
+ </div>
+</div>
+
View
@@ -7,120 +7,17 @@
strap_line => 'When you need <em>Perl</em> think <strong>perl.org</strong>',
crum => '<a href="/">Home</a>',
};
-
- PROCESS tpl/tips.html;
-
--%]
-[%- BLOCK nav_tabs %]
-<ul>
- <li[% ' class="selected"' IF page.section == 'home' %]>
- <a href="/">Home</a>
- </li>
- <li class="[% ' selected' IF page.section == 'about' %]">
- <a href="/about/">About DBI</a>
- </li>
- <li class="[% ' selected' IF page.section == 'docs' %]">
- <a href="/docs/">Documentation</a>
- </li>
-
- <li[% ' class="selected"' IF page.section == 'contribute' %]>
- <a href="/contributing/">Contributing</a>
- </li>
- <li[% ' class="selected"' IF page.section == 'support' %]>
- <a href="/support/">Support</a>
- </li>
-
-</ul>
-[% END -%]
-[%- BLOCK quick_link_creator %]
-[%-
- IF quick_link_list.size == 0;
- RETURN;
- END;
--%]
-<div class="quick_links">
- <h4 class="round">
- [% quick_link_title %]
- </h4>
- <div class="list">
- [% FOREACH p = quick_link_list %]
- <p>[% p %]</p>
- [% END %]
- </div>
-</div>
-[% END -%]
-[%- BLOCK tip %][% UNLESS tip; RETURN; END; %]
-<div class="quick_links">
- <h4 class="round">
- Tip
- </h4>
- <div class="list">
- <p>
- <strong>[% tip.title %]</strong>
- [% tip.desc %]
- </p>
- </div>
-</div>
-[% END -%]
-
-[%- BLOCK quick_links_1;
-
- SET source = {
+ page.import({
quick_links_1_title => 'Find out more',
quick_links_1_list => [
'<a href="http://search.cpan.org/author/TIMB/DBI/">Download latest</a>',
'<a href="http://search.cpan.org/author/TIMB/DBI/DBI.pm">Perldoc</a>',
'<a href="http://search.cpan.org/search?query=DBD%3A%3A&mode=module">Latest DBD modules</a>',
'<a href="http://dbi.tiddlyspot.com/">FAQ</a>',
],
- };
-
- IF page.quick_links_1_title;
- source = page;
- ELSIF section_data && section_data.quick_links_1_title;
- source = section_data;
- END;
-
- IF source.quick_links_1_title;
- PROCESS quick_link_creator
- quick_link_title => source.quick_links_1_title,
- quick_link_list => source.quick_links_1_list;
- END;
--%]
-[% END -%]
-[%- BLOCK quick_links_2;
-
- SET source = {};
-
- IF page.quick_links_2_title;
- source = page;
- ELSIF section_data && section_data.quick_links_2_title;
- source = section_data;
- END;
+ });
+
+ PROCESS tpl/tips.html;
- IF source.quick_links_2_title;
- PROCESS quick_link_creator
- quick_link_title => source.quick_links_2_title,
- quick_link_list => source.quick_links_2_list;
- END;
-%]
-[% END -%]
-[%- BLOCK quick_links_3 %]
-
-<div class="quick_links dbi_book">
- <h4 class="round">
- DBI Book
- </h4>
- <div class="list">
- <p align="center">
- <iframe align="center" src="http://rcm.amazon.com/e/cm?lt1=_blank&bc1=FFFFFF&IS2=1&bg1=FFFFFF&fc1=000000&lc1=0000FF&t=develooper&o=1&p=8&l=as1&m=amazon&f=ifr&asins=1565926994" style="width:120px;height:240px;" scrolling="no" marginwidth="0" marginheight="0" frameborder="0"></iframe>
- </p>
-
- </div>
-</div>
-
-
-
-[% END -%]
-
Oops, something went wrong.

0 comments on commit fe8ac6e

Please sign in to comment.