cvs: php-testfest-web /PHP/App Base.php Contributors.php Index.php Mentors.php /PHP/App/Base/Layout _contributors_nav.php _mentors_nav.php main.php
/PHP/App/Contributors/Locale en_US.php /PHP/App/Contributors/View index.php upload.php /PHP/App/Index/View index.php /PHP/App/Mentors/View
announce.php index.php login.php /public/css style.css /public/images tab-round.png testfest_composite.png

goldoraf Thu Apr 17 14:38:26 2008 UTC Added files: /php-testfest-web/PHP/App/Base/Layout _contributors_nav.php _mentors_nav.php /php-testfest-web/PHP/App/Contributors/View upload.php /php-testfest-web/public/images tab-round.png testfest_composite.png Modified files: /php-testfest-web/PHP/App Base.php Contributors.php Index.php Mentors.php /php-testfest-web/PHP/App/Base/Layout main.php /php-testfest-web/PHP/App/Contributors/Locale en_US.php /php-testfest-web/PHP/App/Contributors/View index.php /php-testfest-web/PHP/App/Index/View index.php /php-testfest-web/PHP/App/Mentors/View announce.php index.php login.php /php-testfest-web/public/css style.css Log: - Cleaned up layout and stylesheet. - Refactored some controller properties into PHP_App_Base. - Simplified all templates. - Added one navigation partial for each area.

http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Base.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/PHP/App/Base.php diff -u php-testfest-web/PHP/App/Base.php:1.1 php-testfest-web/PHP/App/Base.php:1.2 --- php-testfest-web/PHP/App/Base.php:1.1 Tue Apr 1 01:50:53 2008 +++ php-testfest-web/PHP/App/Base.php Thu Apr 17 14:38:25 2008 @@ -6,4 +6,29 @@ * can have the same templates shared * accross modules */ -class PHP_App_Base extends Solar_Controller_Page {} +class PHP_App_Base extends Solar_Controller_Page +{ + /** + * Type of layout to use. + * + * @var String The layout to use. + */ + protected $_layout = 'main'; + + /** + * The default action + * + * This is the default action called when this + * controller is invoked. + * + * @var string The default action to invoke. + */ + protected $_action_default = 'index'; + + /** + * Name of the partial to use for navigation + * + * @var string The name of the partial. + */ + public $nav_partial = false; +} http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Contributors.php?r1=1.2&r2=1.3&diff_format=u Index: php-testfest-web/PHP/App/Contributors.php diff -u php-testfest-web/PHP/App/Contributors.php:1.2 php-testfest-web/PHP/App/Contributors.php:1.3 --- php-testfest-web/PHP/App/Contributors.php:1.2 Tue Apr 1 04:34:04 2008 +++ php-testfest-web/PHP/App/Contributors.php Thu Apr 17 14:38:25 2008 @@ -9,45 +9,32 @@ */ class PHP_App_Contributors extends PHP_App_Base { - /** - * Type of layout to use. + * Name of the partial to use for navigation * - * @var String The layout to use. + * @var string The name of the partial. */ - protected $_layout = 'main'; - - /** - * The default action - * - * This is the default action called when this - * controller is invoked. - * - * @var string The default action to invoke. - */ - protected $_action_default = 'index'; - /** - * The output to display. This is mostly an - * example of anything running with variables. - * - * @var string The output variable - */ - public $output = ''; - + public $nav_partial = '_contributors_nav'; + /** * Action index. * * This action index when the /contributors root is invoked. * - * The string passed to this output is the string that you can - * get through $this->getText() which will then be i18ned to whichever - * language it is set in your locale and in your locale folder. - * - * @see $this->output * @return void */ public function actionIndex() { - $this->output = 'CONTRIBUTORS_WELCOME'; + + } + + /** + * Action upload. + * + * @return void + */ + public function actionUpload() + { + } -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Index.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/PHP/App/Index.php diff -u php-testfest-web/PHP/App/Index.php:1.1 php-testfest-web/PHP/App/Index.php:1.2 --- php-testfest-web/PHP/App/Index.php:1.1 Tue Apr 1 01:50:53 2008 +++ php-testfest-web/PHP/App/Index.php Thu Apr 17 14:38:25 2008 @@ -11,23 +11,6 @@ class PHP_App_Index extends PHP_App_Base { /** - * Type of layout to use. - * - * @var String The layout to use. - */ - protected $_layout = 'main'; - - /** - * The default action - * - * This is the default action called when this - * controller is invoked. - * - * @var string The default action to invoke. - */ - protected $_action_default = 'index'; - - /** * The output to display. This is mostly an * example of anything running with variables. * http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Mentors.php?r1=1.4&r2=1.5&diff_format=u Index: php-testfest-web/PHP/App/Mentors.php diff -u php-testfest-web/PHP/App/Mentors.php:1.4 php-testfest-web/PHP/App/Mentors.php:1.5 --- php-testfest-web/PHP/App/Mentors.php:1.4 Sun Apr 13 15:42:32 2008 +++ php-testfest-web/PHP/App/Mentors.php Thu Apr 17 14:38:25 2008 @@ -9,23 +9,13 @@ */ class PHP_App_Mentors extends PHP_App_Base { - - /** - * Type of layout to use. - * - * @var String The layout to use. - */ - protected $_layout = 'main'; - /** - * The default action - * - * This is the default action called when this - * controller is invoked. + * Name of the partial to use for navigation * - * @var string The default action to invoke. + * @var string The name of the partial. */ - protected $_action_default = 'index'; + public $nav_partial = '_mentors_nav'; + /** * The output to display. This is mostly an * example of anything running with variables. http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Base/Layout/main.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/PHP/App/Base/Layout/main.php diff -u php-testfest-web/PHP/App/Base/Layout/main.php:1.1 php-testfest-web/PHP/App/Base/Layout/main.php:1.2 --- php-testfest-web/PHP/App/Base/Layout/main.php:1.1 Tue Apr 1 01:53:25 2008 +++ php-testfest-web/PHP/App/Base/Layout/main.php Thu Apr 17 14:38:25 2008 @@ -6,32 +6,40 @@ <link rel="stylesheet" type="text/css" href="/public/css/style.css" media="screen" /> </head> <body> - -<?php echo $this->layout_content; ?> - -<div id="left"> - <!-- News (RSS) --> - <div class="box"> - <h2>News :</h2> - <p>News about the Test Fest</p> - </div> - <!-- Links to ... --> - <div class="box"> - <h2>Links :</h2> - <ul> - <li><a href="http://php.net">PHP</a></li> - <li><a href="http://qa.php.net">PHP QA</a></li> - <li><a href="http://wiki.php.net">PHP Wiki</a></li> - <li><a href="http://docs.php.net">PHP Docs</a></li> - <li><a href="http://bugs.php.net">PHP Bugs</a></li> - <li><a href="http://qa.php.net/testfest">PHP TestFest</a></li> - </ul> - </div> - <!-- Original designer --> - <div class="box"> - <div style="font-size: 0.8em;">Design by <a href="http://www.minimalistic-design.net">Minimalistic Design</a></div> - </div> -</div> +<div id="container"> + + <div id="header"> + <h1 class="header-logo">PHP Testfest 2008</h1> + <!-- Links to ... --> + <ul id="header-links"> + <li><a href="http://php.net">PHP</a></li> + <li><a href="http://qa.php.net">PHP QA</a></li> + <li><a href="http://wiki.php.net">PHP Wiki</a></li> + <li><a href="http://docs.php.net">PHP Docs</a></li> + <li><a href="http://bugs.php.net">PHP Bugs</a></li> + </ul> + <?php if ($this->nav_partial) echo $this->partial($this->nav_partial); ?> + </div> + + <div id="wrapper"> + <div id="content"> + <?php echo $this->layout_content; ?> + </div> + </div> + + <div id="sidebar"> + <!-- News (RSS) --> + <div class="box"> + <h2>News :</h2> + <p>News about the Test Fest</p> + </div> + </div> + + <div id="footer"> + <a href="http://php.net/copyright.php">Copyright &copy; 2001-2008 The PHP Group</a><br /> + All rights reserved. + </div> + </div> </body> </html> http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Contributors/Locale/en_US.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/PHP/App/Contributors/Locale/en_US.php diff -u php-testfest-web/PHP/App/Contributors/Locale/en_US.php:1.1 php-testfest-web/PHP/App/Contributors/Locale/en_US.php:1.2 --- php-testfest-web/PHP/App/Contributors/Locale/en_US.php:1.1 Tue Apr 1 01:53:25 2008 +++ php-testfest-web/PHP/App/Contributors/Locale/en_US.php Thu Apr 17 14:38:26 2008 @@ -3,4 +3,9 @@ return array( 'CONTRIBUTORS_WELCOME' => 'Welcome contributors!', 'CONTRIBUTORS_AREA' => 'Contributors Area!', + 'UPLOAD_FORM_HEADER' => 'Upload your tests', + 'UPLOAD_FORM_ERROR' => 'An error occured while processing your file. Please retry.', + 'UPLOAD_FORM_LABEL' => 'Test file (.phpt) or zip of test files (.zip, .tar.gz)', + 'UPLOAD_FORM_BUTTON' => 'Upload', + 'UPLOAD_UNZIP_ERROR' => 'An error occured while unziping your file. Please retry.', ); http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Contributors/View/index.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/PHP/App/Contributors/View/index.php diff -u php-testfest-web/PHP/App/Contributors/View/index.php:1.1 php-testfest-web/PHP/App/Contributors/View/index.php:1.2 --- php-testfest-web/PHP/App/Contributors/View/index.php:1.1 Tue Apr 1 01:53:25 2008 +++ php-testfest-web/PHP/App/Contributors/View/index.php Thu Apr 17 14:38:26 2008 @@ -1,16 +1,2 @@ -<div id="header"> - <h1></h1><br /><br /> - <div id="menu"> - <ul id="nav"> - <li class="activelink"><a href="/contributors">My Account</a></li> - <li><a href="/contributors/uploadtest">Upload test(s)</a></li> - <li><a href="/contributors/myfiles">My Files</a></li> - </ul> - </div> -</div> -<div id="content"> -<div id="right"> - <h2><?php $this->getText('CONTRIBUTORS_AREA'); ?></h2> - <p><?php echo $this->getText('CONTRIBUTORS_WELCOME'); ?></p> - </div> -</div> +<h2><?php echo $this->getText('CONTRIBUTORS_AREA'); ?></h2> +<p><?php echo $this->getText('CONTRIBUTORS_WELCOME'); ?></p> http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Index/View/index.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/PHP/App/Index/View/index.php diff -u php-testfest-web/PHP/App/Index/View/index.php:1.1 php-testfest-web/PHP/App/Index/View/index.php:1.2 --- php-testfest-web/PHP/App/Index/View/index.php:1.1 Tue Apr 1 01:53:25 2008 +++ php-testfest-web/PHP/App/Index/View/index.php Thu Apr 17 14:38:26 2008 @@ -1,17 +1,16 @@ -<div id="header"> - <h1></h1><br /><br /> - <div id="menu"> - <ul id="nav"> - <li class="activelink"><a href="/">Home</a></li> - <li><a href="/mentors">Mentors</a></li> - <li><a href="/contributors">Contributors</a></li> - </ul> - </div> -</div> -<div id="content"> -<div id="right"> - <h2><?php echo $this->getText('INDEX_PUBLIC_AREA'); ?></h2> +<div> + <h2><?php echo $this->getText('INDEX_PUBLIC_AREA'); ?></h2> <p><?php echo $this->output; ?></p> - </div> -</div> +</div> +<div> + <h3>Signup</h3> + <form method="post" action=""> + <p><label>Username</label><br /> + <input type="text" name="login" id="login" size="30" /></p> + <p><label>Password</label><br /> + <input type="password" name="password" id="password" size="30" /></p> + <p><input type="checkbox" />&nbsp;mentor ?</p> + <p style="text-align: right;"><input type="submit" name="commit" value="Signup" class="login-submit" /> or <a href="/register">register</a></p> + </form> +</div> http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Mentors/View/announce.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/PHP/App/Mentors/View/announce.php diff -u php-testfest-web/PHP/App/Mentors/View/announce.php:1.1 php-testfest-web/PHP/App/Mentors/View/announce.php:1.2 --- php-testfest-web/PHP/App/Mentors/View/announce.php:1.1 Sun Apr 13 15:40:04 2008 +++ php-testfest-web/PHP/App/Mentors/View/announce.php Thu Apr 17 14:38:26 2008 @@ -1,17 +1,4 @@ -<div id="header"> - <h1></h1><br /><br /> - <div id="menu"> - <ul id="nav"> - <li><a href="/mentors/my">My Account</a></li> - <li><a href="/mentors/review">Test Review</a></li> - <li><a href="/mentors/livetest">Live Testing Area</a></li> - <li class="activeLink"><a href="/mentors/announce">Announcements</a></li> - </ul> - </div> -</div> -<div id="content"> -<div id="right"> - <h2>Mentors area</h2> +<h2>Mentors area</h2> <?php echo $this->form() ->text(array( @@ -32,5 +19,3 @@ )) ->fetch(); ?> - </div> -</div> http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Mentors/View/index.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/PHP/App/Mentors/View/index.php diff -u php-testfest-web/PHP/App/Mentors/View/index.php:1.1 php-testfest-web/PHP/App/Mentors/View/index.php:1.2 --- php-testfest-web/PHP/App/Mentors/View/index.php:1.1 Tue Apr 1 01:53:25 2008 +++ php-testfest-web/PHP/App/Mentors/View/index.php Thu Apr 17 14:38:26 2008 @@ -1,18 +1,3 @@ -<div id="header"> - <h1></h1><br /><br /> - <div id="menu"> - <ul id="nav"> - <li class="activelink"><a href="/mentors/my">My Account</a></li> - <li><a href="/mentors/review">Test Review</a></li> - <li><a href="/mentors/livetest">Live Testing Area</a></li> - <li><a href="/mentors/announce">Announcements</a></li> - </ul> - </div> -</div> -<div id="content"> -<div id="right"> - <h2>Mentors area</h2> - <p><?php echo $this->getText('MENTORS_WELCOME');?></p> - </div> -</div> +<h2>Mentors area</h2> +<p><?php echo $this->getText('MENTORS_WELCOME');?></p> http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Mentors/View/login.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/PHP/App/Mentors/View/login.php diff -u php-testfest-web/PHP/App/Mentors/View/login.php:1.1 php-testfest-web/PHP/App/Mentors/View/login.php:1.2 --- php-testfest-web/PHP/App/Mentors/View/login.php:1.1 Tue Apr 1 04:34:27 2008 +++ php-testfest-web/PHP/App/Mentors/View/login.php Thu Apr 17 14:38:26 2008 @@ -1,17 +1,4 @@ -<div id="header"> - <h1></h1><br /><br /> - <div id="menu"> - <ul id="nav"> - <li class="activelink"><a href="/mentors/my">My Account</a></li> - <li><a href="/mentors/review">Test Review</a></li> - <li><a href="/mentors/livetest">Live Testing Area</a></li> - <li><a href="/mentors/announce">Announcements</a></li> - </ul> - </div> -</div> -<div id="content"> -<div id="right"> - <h2>Mentors area</h2> +<h2>Mentors area</h2> <?php echo $this->form() ->text(array( @@ -28,6 +15,3 @@ )) ->fetch(); ?> - - </div> -</div> http://cvs.php.net/viewvc.cgi/php-testfest-web/public/css/style.css?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/public/css/style.css diff -u php-testfest-web/public/css/style.css:1.1 php-testfest-web/public/css/style.css:1.2 --- php-testfest-web/public/css/style.css:1.1 Tue Apr 1 01:53:26 2008 +++ php-testfest-web/public/css/style.css Thu Apr 17 14:38:26 2008 @@ -1,124 +1,129 @@ -html,body { - margin:0; - padding:0 -} - -body { - font: 85%/1.3 TrebuchetMS,Arial,sans-serif; - text-align: left; - background: #fff; - padding-bottom:20px; -} - -a { - color: #0066B3; - background: inherit; - text-decoration: none; -} - -h1 { - font: bold 2.1em Arial, Arial, Sans-Serif; - color: #036DA7 -} - -h2 { - font: bold 1.1em Arial, Arial, Sans-Serif; - padding: 0; margin: 0; -} - -div#header { - width: 100%; - overflow: hidden; - background: #9999cc; - background-image: url(/public/images/testfest_small_08.png); - background-repeat: no-repeat; - background-attachement: fixed; - background-position: left top; -} - -div#header h1,div#menu { - width: 770px; - margin: 0 auto; - text-align:left -} - -div#header h1 { - padding: 30px 0 20px; - color: #fff; -} - -ul#nav,ul#nav li { - list-style-type:none; - margin:0; - padding:0; -} - -ul#nav { - float:right; - font-size: 80%; -} - -ul#nav li { - float:left; - margin-left: 3px; - text-align: center -} - -ul#nav a { - float:left; - width: 95px; - padding: 5px 0; - background: #E7F1F8; - text-decoration:none; - color: #666; - border-top : 1px solid #9999cc; - border-left : 1px solid #9999cc; - border-right : 1px solid #9999cc; -} - -ul#nav a:hover { - background: #fff;color: #000; -} - -ul#nav li.activelink a,ul#nav li.activelink a:hover { - background: #FFF; - color: #003; -} - - -#right { - float: left; - width: 76%; - padding: 1em; - margin-bottom: 1.2em; - margin-top: 16px; - background: #eee; - text-align: justify; -} - -#left { - float: right; - width: 20%; - margin: 0 0 10px 0; - -} - -#left .box { - - padding: 1em; - margin: 0 0 1em 0; - background : #FFF6BF; -} - - -#content { -font: 95%/1.3 TrebuchetMS,Arial,sans-serif; - margin: 0 auto; - padding: 15px; - background: #fff; - - -} - -ul { padding: 0; margin: 0;} -li { list-style-type: none;} +/* ----- CSS Reset ----- */ +* { + margin: 0; + padding: 0; +} + +/* ----- Basics ----- */ +body { + font: 85%/1.3 TrebuchetMS,Arial,sans-serif; + text-align: left; + background: #fff; +} + +a { + color: #6972a8; +} + +h1 { + font: bold 2.1em Arial, Arial, Sans-Serif; + color: #036DA7; +} + +h2 { + font: bold 1.1em Arial, Arial, Sans-Serif; +} + +/* ----- Layout ----- */ +div#container { + background-color: #fff; +} + +div#header { + background-color: #282c2f; /*background: #202326;*/ +} + +div#wrapper { + float:left; + width:100%; + margin-left:-200px; +} + +div#content { + margin-left:200px; + padding: 1em; + border-right: 1px solid gray; + min-height: 400px; +} + +div#sidebar { + float:right; + width:160px; + padding: 1em; + /*background-color: #009200;*/ +} + +div#footer { + clear:both; + /*background-color: #ddd;*/ + border-top: 1px solid gray; + padding: .5em; +} + +h1.header-logo { + width: 330px; height: 100px; + background: url("/public/images/testfest_composite.png"); + text-indent: -9999px; +} + + +/* ----- Navs ----- */ +ul#header-links { + position: absolute; + top: 0; + right: 0; + list-style: none; +} + +ul#header-links li { + float: left; + margin: 0 10px; +} + +ul#nav-links { + border-bottom: solid 1px #DEDEDE; + height: 2em; + padding-left: 450px; + list-style: none; +} + +ul#nav-links li { + float:left; + margin-right:2px; +} + +ul#nav-links a { + background: transparent url("/public/images/tab-round.png"); + color: #008; + display: block; + float: left; + height: 2em; + padding-left: 10px; + text-decoration: none; +} + +ul#nav-links span { + background: #282c2f url("/public/images/tab-round.png") 100% 0; + display: block; + line-height: 2em; + padding-right: 10px; +} + +ul#nav-links a:hover { + background-position: 0 -120px; +} + +ul#nav-links a:hover span { + background-position: 100% -120px; +} + +ul#nav-links li.current a { + background-position: 0 -60px; + color: #fff; + font-weight: bold; +} + +ul#nav-links li.current span { + background-position: 100% -60px; +} + http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Base/Layout/_contributors_nav.php?view=markup&rev=1.1 Index: php-testfest-web/PHP/App/Base/Layout/_contributors_nav.php +++ php-testfest-web/PHP/App/Base/Layout/_contributors_nav.php <ul id="nav-links"> <li class="current"><a href="/contributors"><span>My Account</span></a></li> <li><a href="/contributors/upload"><span>Upload test(s)</span></a></li> <li><a href="/contributors/myfiles"><span>My Files</span></a></li> </ul> http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Base/Layout/_mentors_nav.php?view=markup&rev=1.1 Index: php-testfest-web/PHP/App/Base/Layout/_mentors_nav.php +++ php-testfest-web/PHP/App/Base/Layout/_mentors_nav.php <ul id="nav-links"> <li class="current"><a href="/mentors/my"><span>My Account</span></a></li> <li><a href="/mentors/review"><span>Test Review</span></a></li> <li><a href="/mentors/livetest"><span>Live Testing Area</span></a></li> <li><a href="/mentors/announce"><span>Announcements</span></a></li> </ul> http://cvs.php.net/viewvc.cgi/php-testfest-web/PHP/App/Contributors/View/upload.php?view=markup&rev=1.1 Index: php-testfest-web/PHP/App/Contributors/View/upload.php +++ php-testfest-web/PHP/App/Contributors/View/upload.php <h2><?php echo $this->getText('UPLOAD_FORM_HEADER'); ?></h2> <form method="post" enctype="multipart/form-data" action="/contributors/upload"> <div id="form_error"><?php if ($this->upload_error) echo $this->getText($this->upload_error); ?></div> <label for="testfile"><?php echo $this->getText('UPLOAD_FORM_LABEL'); ?></label> <input type="file" name="testfile" /> <input type="submit" name="commit" value="<?php echo $this->getText('UPLOAD_FORM_BUTTON'); ?>" /> </form>