[dgoette] 37453: * use proper html * include css & js files in <head> instaed of in <body> if possible * fix minor bugs
Author: dgoette Date: Wed Nov 19 05:15:29 2008 New Revision: 37453
URL: http://svn.reactos.org/svn/reactos?rev=37453&view=rev Log: * use proper html * include css & js files in <head> instaed of in <body> if possible * fix minor bugs
Added: branches/danny-web/reactos.org/htdocs/roscms/css/cms_maintain.css (with props) Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js.php branches/danny-web/reactos.org/htdocs/roscms/js/cms_navigation.js.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_Nopermission.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Activate.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Login.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_LostPassword.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Register.class.php
Added: branches/danny-web/reactos.org/htdocs/roscms/css/cms_maintain.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/css/cms_maintain.css (added) +++ branches/danny-web/reactos.org/htdocs/roscms/css/cms_maintain.css [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -1,0 +1,1 @@ +TEXTAREA { width: 100%; }
Propchange: branches/danny-web/reactos.org/htdocs/roscms/css/cms_maintain.css ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_maintain.js.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -1,3 +1,4 @@ +<?php include('../custom.php'); ?>
function optimizedb() { makeRequest('?page=data_out&d_f=maintain&d_u=optimize', 'optimize', 'maintainarea');
Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_navigation.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_navigation.js.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_navigation.js.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -1,3 +1,6 @@ +<?php + include_once('../custom.php'); ?> + function pagerefresh() { exitmsg = ''; window.location.href = '<?php echo $roscms_intern_page_link."data&branch=".urldecode(@$_GET['branch']); ?>';
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -27,12 +27,20 @@
protected $page_start; // start time of page generation protected $title; - protected $css; + protected $css_files=array(); + protected $js_files=array();
public function __construct( $page_title = '', $page_css = 'roscms' ) { + // get page title and register css files $this->title = $page_title; - $this->css = $page_css; + if ($page_css == 'roscms'){ + $this->register_css('style_v3.css'); + } + else { + $this->register_css('style.css'); + $this->register_css('logon.css'); + }
// this page was generated in ... $roscms_gentime = explode(' ',microtime()); @@ -73,7 +81,7 @@
// output header echo_strip( ' - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html lang="'.$roscms_langres['lang_code'].'"> <head> <title>ReactOS '.(($this->title!=='') ? '- '.$this->title : '').'</title> @@ -83,15 +91,21 @@ <meta name="generator" content="RosCMS" /> <meta name="Content-language" content="'.$roscms_langres['lang_code'].'" /> <meta name="Robots" content="noindex,nofollow" /> + <meta http-equiv="Content-Script-Type" content="text/javascript" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> <link rel="SHORTCUT ICON" href="../favicon.ico" />');
- if ($this->css == 'roscms') { - echo '<link href="'.$roscms_intern_webserver_roscms.'css/style_v3.css" type="text/css" rel="stylesheet" />'; + // link css & js files (use register_* methods) + foreach($this->css_files as $file) { + if ($file['condition'] === false) { + echo '<link href="'.$roscms_intern_webserver_roscms.'css/'.$file['name'].'" type="text/css" rel="stylesheet" />'; + } + else { + echo '<!--[if '.$file['condition'].']<link href="'.$roscms_intern_webserver_roscms.'css/'.$file['name'].'" type="text/css" rel="stylesheet" /><![endif]-->'; + } } - else { - echo_strip(' - <link href="'.$roscms_intern_webserver_roscms.'css/style.css" type="text/css" rel="stylesheet" /> - <link href="'.$roscms_intern_webserver_roscms.'css/logon.css" type="text/css" rel="stylesheet" />'); + foreach($this->js_files as $file) { + echo '<script src="'.$roscms_intern_webserver_roscms.'js/'.$file.'" type="text/javascript"></script>'; }
echo_strip(' @@ -99,17 +113,15 @@ <body> <div id="top"> <div id="topMenu"> - <p align="center" style="color: white;"> + <p style="color: white;text-align: center;"> <a href="'.$roscms_intern_webserver_pages.'?page=index">'.$roscms_langres['Home'].'</a> <span>|</span> <a href="'.$roscms_intern_webserver_pages.'?page=about">'.$roscms_langres['Info'].'</a> <span>|</span> <a href="'.$roscms_intern_webserver_pages.'?page=community">'.$roscms_langres['Community'].'</a> <span>|</span> <a href="'.$roscms_intern_webserver_pages.'?page=dev">'.$roscms_langres['Dev'].'</a> <span>|</span> <a href="'.$roscms_intern_webserver_roscms.'?page=user">'.$roscms_langres['myReactOS'].'</a> - </p> - </div> - </div> - - <!-- Start of Navigation Bar -->'); + </p> + </div> + </div>'); } // end of member function header
@@ -129,17 +141,37 @@
// footer information echo_strip(' - <hr size="1" /> - + <hr /> <div id="footer" style="text-align:center;"> '.$roscms_extern_brand.' '.$roscms_extern_version_detail.' - (c) 2005-2007 Klemens Friedl<br /> <br /> Page generated in '.$page_time.' seconds </div> - </body> </html>'); } // end of member function footer
+ + /** + * register a css file to be included in the header + * + * @access protected + */ + protected function register_css( $name, $condition = false ) + { + $this->css_files[] = array('name'=>$name, 'condition'=>$condition); + } // end of member function register_css + + + /** + * register a javascript file to be included in the header + * + * @access protected + */ + protected function register_js( $name ) + { + $this->js_files[] = $name; + } // end of member function register_css + } // end of HTML ?>
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -42,22 +42,26 @@ header('location:?page=nopermission'); }
+ // register css & js files + $this->register_css('cms_navigation.css'); + $this->register_js('cms_navigation.js.php'); + parent::__construct( $page_title, 'roscms'); }
protected function build() { - parent::header(); + $this->header(); $this->navigation(); $this->body(); - parent::footer(); + $this->footer(); }
/** * * - * @access public + * @access private */ private function navigation( ) { @@ -66,26 +70,6 @@ global $roscms_intern_login_check_username; global $roscms_intern_page_link; global $roscms_intern_webserver_pages, $roscms_intern_page_link; - - // get CSS - echo ' - <style type="text/css"> - <!-- - '; - include('css/cms_navigation.css'); - echo ' - --> - </style>'; - - // Javascript - echo ' - <script language="javascript" type="text/javascript"> - <!-- - '; - include('js/cms_navigation.js.php'); - echo ' - --> - </script>';
// get selected navigation entry echo_strip(' @@ -101,7 +85,7 @@ <a href="'.$roscms_intern_page_link.'logout">Sign out</a> </div> <div class="roscms_page"> - <table id="mt" border="0" cellpadding="0" cellspacing="0" width="100%"> + <table id="mt" border="0" cellpadding="0" cellspacing="0" style="width:100%"> <tbody> <tr> <th class="int'.(($this->branch == 'welcome') ? '2' : '1').'" onclick="'."roscms_mainmenu('welcome')".'"> @@ -126,52 +110,52 @@
if (ROSUser::isMemberOfGroup('transmaint','ros_admin','ros_sadmin')) { echo_strip(' - <th class="int'.(($this->branch == 'user') ? '2' : '1').'" onclick="'."roscms_mainmenu('user')".'"> - <div class="tc1"> - <div class="tc2"> - <div class="tc3"></div> - </div> - </div> - <div class="tblbl">User</div> - </th> - <td> </td>'); + <th class="int'.(($this->branch == 'user') ? '2' : '1').'" onclick="'."roscms_mainmenu('user')".'"> + <div class="tc1"> + <div class="tc2"> + <div class="tc3"></div> + </div> + </div> + <div class="tblbl">User</div> + </th> + <td> </td>'); }
if ($roscms_security_level == 3) { echo_strip(' - <th class="int'.(($this->branch == 'maintain') ? '2' : '1').'" onclick="'."roscms_mainmenu('maintain')".'"> - <div class="tc1"> - <div class="tc2"> - <div class="tc3"></div> - </div> - </div> - <div class="tblbl">Maintain</div> - </th> - <td> </td> - - <th class="int'.(($this->branch == 'stats') ? '2' : '1').'" onclick="'."roscms_mainmenu('stats')".'"> - <div class="tc1"> - <div class="tc2"> - <div class="tc3"></div> - </div> - </div> - <div class="tblbl">Statistics</div> - </th> - <td> </td>'); + <th class="int'.(($this->branch == 'maintain') ? '2' : '1').'" onclick="'."roscms_mainmenu('maintain')".'"> + <div class="tc1"> + <div class="tc2"> + <div class="tc3"></div> + </div> + </div> + <div class="tblbl">Maintain</div> + </th> + <td> </td> + + <th class="int'.(($this->branch == 'stats') ? '2' : '1').'" onclick="'."roscms_mainmenu('stats')".'"> + <div class="tc1"> + <div class="tc2"> + <div class="tc3"></div> + </div> + </div> + <div class="tblbl">Statistics</div> + </th> + <td> </td>'); }
echo_strip(' - <td width="100%"> - <div align="right" id="ajaxloadinginfo" style="visibility:hidden;"> - <img src="images/ajax_loading.gif" alt="loading ..." width="13" height="13" /> - </div> - </td> - </tr> - </tbody> - </table> - - <div class="tc2" style="background-color:#C9DAF8;"> - <div class="submenu" style="font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;">'); + <td style="width:100%"> + <div id="ajaxloadinginfo" style="visibility:hidden; text-align: center;"> + <img src="images/ajax_loading.gif" alt="loading ..." width="13" height="13" /> + </div> + </td> + </tr> + </tbody> + </table> + + <div class="tc2" style="background-color:#C9DAF8;"> + <div class="submenu" style="font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;">');
switch ($this->branch) { case 'welcome'; @@ -197,9 +181,20 @@ break; } echo_strip(' - </div> - </div>'); + </div> + </div>'); } // end of member function navigation + + + /** + * + * + * @access protected + */ + protected function footer() { + echo '</div>'; + parent::footer(); + }
} // end of HTML_CMS ?>
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Maintain.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -35,6 +35,10 @@ public function __construct( $page_title = '', $page_css = 'roscms' ) { $this->branch = 'maintain'; + + // register css & js files + $this->register_css('cms_maintain.css'); + $this->register_js('cms_maintain.js.php');
parent::__construct( $page_title, $page_css); } @@ -89,8 +93,8 @@ </div>
<p><a href="javascript:genpages()">Generate All Pages</a></p> - <div id="maintainarea" style="border: 1px dashed red;" style="display:none;"></div> - <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" /> + <div id="maintainarea" style="border: 1px dashed red;display:none;"></div> + <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" alt="" /> <br />');
if (ROSUser::isMemberOfGroup('ros_sadmin')) { @@ -100,24 +104,24 @@ <br /> <h2>RosCMS Global Log</h2> <h3>High Security Log - '.date('Y-W').'</h3> - <textarea name="logviewerhigh" cols="75" rows="7" wrap="off">');echo Log::read('high');echo_strip('</textarea><br /> + <textarea name="logviewerhigh" cols="75" rows="7">');echo Log::read('high');echo_strip('</textarea><br /> <br /> <h3>Medium Security Log - '.date('Y-W').'</h3> - <textarea name="logviewermed" cols="75" rows="5" wrap="off">');echo Log::read('medium');echo_strip('</textarea><br /> + <textarea name="logviewermed" cols="75" rows="5">');echo Log::read('medium');echo_strip('</textarea><br /> <br /><h3>Low Security Log - '.date('Y-W').'</h3> - <textarea name="logviewerlow" cols="75" rows="3" wrap="off">');echo Log::read('low');echo_strip('</textarea><br /> + <textarea name="logviewerlow" cols="75" rows="3">');echo Log::read('low');echo_strip('</textarea><br /> <br /> <br /> <br /> <h2>RosCMS Generator Log</h2> <h3>High Security Log - '.date('Y-W').'</h3> - <textarea name="logviewerhigh2" cols="75" rows="7" wrap="off">');echo Log::read('high','generate');echo_strip('</textarea><br /> + <textarea name="logviewerhigh2" cols="75" rows="7">');echo Log::read('high','generate');echo_strip('</textarea><br /> <br /> <h3>Medium Security Log - '.date('Y-W').'</h3> - <textarea name="logviewermed2" cols="75" rows="5" wrap="off">');echo Log::read('medium','generate');echo_strip('</textarea><br /> + <textarea name="logviewermed2" cols="75" rows="5">');echo Log::read('medium','generate');echo_strip('</textarea><br /> <br /> <h3>Low Security Log - '.date('Y-W').'</h3> - <textarea name="logviewerlow2" cols="75" rows="3" wrap="off">');echo Log::read('low','generate');echo_strip('</textarea><br /> + <textarea name="logviewerlow2" cols="75" rows="3">');echo Log::read('low','generate');echo_strip('</textarea><br /> <br /> <br /> <br /> @@ -130,26 +134,18 @@ echo_strip(' <h3>'.$language['lang_name'].'</h3> <h4>High Security Log - '.date('Y-W').'</h4> - <textarea name="logviewerhigh'.$language['lang_id'].'" cols="75" rows="5" wrap="off">');echo Log::read('high', $language['lang_id']);echo_strip('</textarea><br /> + <textarea name="logviewerhigh'.$language['lang_id'].'" cols="75" rows="5">');echo Log::read('high', $language['lang_id']);echo_strip('</textarea><br /> <br /> <h4>Medium Security Log - '.date('Y-W').'</h4> - <textarea name="logviewermed'.$language['lang_id'].'" cols="75" rows="4" wrap="off">');echo Log::read('medium', $language['lang_id']);echo_strip('</textarea><br /> + <textarea name="logviewermed'.$language['lang_id'].'" cols="75" rows="4">');echo Log::read('medium', $language['lang_id']);echo_strip('</textarea><br /> <br /> <h4>Low Security Log - '.date('Y-W').'</h4> - <textarea name="logviewerlow'.$language['lang_id'].'" cols="75" rows="3" wrap="off">');echo Log::read('low', $language['lang_id']);echo_strip('</textarea><br /> + <textarea name="logviewerlow'.$language['lang_id'].'" cols="75" rows="3">');echo Log::read('low', $language['lang_id']);echo_strip('</textarea><br /> <br /> <br />'); } } // end of ros_admin only
- echo ' - <script type="text/javascript" language="javascript"> - <!-- - '; - include('js/cms_maintain.js.php'); - echo ' - --> - </script>'; }
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_User.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -36,6 +36,10 @@ { $this->branch = 'user';
+ // register css & js files + $this->register_css('cms_user.css'); + $this->register_js('cms_user.js'); + parent::__construct( $page_title, $page_css); }
@@ -53,14 +57,6 @@ return; }
- echo ' - <style type="text/css"> - <!-- - '; - include('css/cms_user.css'); - echo ' - --> - </style>'; echo_strip(' <br /> <h2>User</h2> @@ -84,7 +80,7 @@ <input name="searchopt" type="radio" id="searchopt3" value="email" onclick="getuser()" /><label>email address</label> <input name="searchopt" type="radio" id="searchopt4" value="website" onclick="getuser()" /><label>website</label> <input name="searchopt" type="radio" id="searchopt5" value="language" onclick="getuser()" /><label>language</label> - <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" /><br /> + <img id="ajaxloading" style="display:none;" src="images/ajax_loading.gif" width="13" height="13" alt="" /><br /> <br /> </div> <div id="userarea"></div> @@ -104,14 +100,6 @@ echo_strip(' </ul> <br />'); - echo ' - <script type="text/javascript" language="javascript"> - <!-- - '; - include('js/cms_user.js'); - echo ' - --> - </script>'; }
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -36,6 +36,15 @@ { $this->branch = 'website';
+ // register css + $this->register_css('cms_website.css'); + $this->register_css('cms_website-ie.css','IE'); + + $this->register_js('cms_website.js'); + $this->register_js('cms_website.js.php'); + $this->register_js('diffv3.js'); + $this->register_js('../editor/jscripts/tiny_mce/tiny_mce_src.js'); + $this->register_js('../editor/jscripts/mef.js'); parent::__construct( $page_title, $page_css); }
@@ -61,7 +70,7 @@ <p>It does work fine in Internet Explorer 5.5+, Mozilla Firefox 1.5+, Opera 9.1+, Safari 3.2+ and probably every client with basic Javascript (+AJAX) support.</p> </noscript>'); echo ' - <script type="text/javascript" language="javascript"> + <script type="text/javascript"> <!--'." // Navigation Data var roscms_current_page = 'new'; @@ -123,28 +132,9 @@
var exitmsg = ".'"Click Cancel to continue with RosCMS, click OK to leave RosCMS.\n\nThanks for using RosCMS!"'." --> - </script>"; - echo_strip(' - <script language="javascript" type="text/javascript" src="'.$roscms_intern_webserver_roscms.'js/cms_website.js"></script> - <script language="javascript" type="text/javascript" src="'.$roscms_intern_webserver_roscms.'js/cms_website.js.php"></script> - <script language="javascript" type="text/javascript" src="'.$roscms_intern_webserver_roscms.'editor/jscripts/tiny_mce/tiny_mce_src.js"></script> - <script language="javascript" type="text/javascript" src="'.$roscms_intern_webserver_roscms.'editor/jscripts/mef.js"></script> - <script language="javascript" type="text/javascript" src="'.$roscms_intern_webserver_roscms.'js/diffv3.js"></script>'); - - echo ' - <style type="text/css"> - <!--'; - - include('css/cms_website.css'); - - echo '--><!--[if IE]>'; - include('css/cms_website-ie.css'); - echo '<![endif]--> - </style>'; - - echo_strip(' + </script>";echo_strip(' <div class="spacer"> </div> - <div align="center" style="padding-top: 8px; padding-bottom: 5px;"> + <div style="padding-top: 8px; padding-bottom: 5px;text-align: center"> <div id="alertb" class="infobox" style="visibility:hidden;"> <div class="lab1"> <div class="lab2"> @@ -290,7 +280,7 @@ <div class="rounded_ul"> <div class="rounded_ur"> <div class="bubble" id="bub"> - <div id="frametable" name="frametable" style="border: 0px dashed white;"> + <div id="frametable" style="border: 0px dashed white;"> <div class="filterbar"> <input id="txtfind" type="text" accesskey="f" tabindex="1" title="Search & Filters" onfocus="'."textbox_hint(this.id, this.value, 'Search & Filters', 1)".'" onblur="'."textbox_hint(this.id, this.value, 'Search & Filters', 0)".'" onkeyup="filtsearchbox()" value="Search & Filters" size="39" maxlength="250" class="tfind" /> <span id="filters" class="filterbutton" onclick="TabOpenClose(this.id)"><img id="filtersi" src="images/tab_closed.gif" alt="" style="width:11px; height:11px; border:0px;" /> Filters</span> @@ -303,7 +293,7 @@ <span class="filterbutton" onclick="filtsearch()"><img src="images/search.gif" alt="" style="width:14px; height:14px; border:0px;" /> Search</span> </div> </div>');echo ' - <script type="text/javascript" language="javascript"> + <script type="text/javascript"> <!-- // add first filter entry (default) filtentryclear(); @@ -358,44 +348,43 @@ <p><strong>Table Legend</strong></p> <table id="legend" cellspacing="5"> <tr> - <td class="lbox" bgcolor="#dddddd"> </td> - <td width="205" rowspan="2"> + <td class="lbox" style="background-color:#ddd"> </td> + <td style="width:205px" rowspan="2"> Standard<br /> <span class="style2">(odd/even)</span> </td> - <td width="50" rowspan="5"> </td> - <td class="lbox" bgcolor="#ffcc99"> </td> - <td width="205">Selected</td> - </tr> - <tr> - <td class="lbox" bgcolor="#eeeeee"> </td> - <td class="lbox" bgcolor="#A3EDB4"> </td> + <td style="width:50px" rowspan="5"> </td> + <td class="lbox" style="background-color:#ffcc99"> </td> + <td style="width:205px">Selected</td> + </tr> + <tr> + <td class="lbox" style="background-color:#eeeeee"> </td> + <td class="lbox" style="background-color:#A3EDB4"> </td> <td>Translation up to date</td> </tr> <tr> - <td class="lbox" bgcolor="#B5EDA3"> </td> + <td class="lbox" style="background-color:#B5EDA3"> </td> <td>New</td> - <td class="lbox" bgcolor="#D6CAE4"> </td> + <td class="lbox" style="background-color:#D6CAE4"> </td> <td>Translation doesn't exist</td> </tr> <tr> - <td class="lbox" bgcolor="#FFE4C1"> </td> + <td class="lbox" style="background-color:#FFE4C1"> </td> <td>Draft</td> - <td class="lbox" bgcolor="#FAA5A5"> </td> + <td class="lbox" style="background-color:#FAA5A5"> </td> <td>Translation outdated</td> </tr> <tr> - <td class="lbox" bgcolor="#ffffcc"> </td> + <td class="lbox" style="background-color:#ffffcc"> </td> <td>Mouse hover</td> - <td class="lbox" bgcolor="#FFCCFF"> </td> + <td class="lbox" style="background-color:#FFCCFF"> </td> <td>Unknown</td> </tr> </table> </div> </div> - </div> - <br /> - <script type="text/javascript" language="javascript" src="'.$roscms_intern_webserver_roscms.'js/cms_website-init.js"></script>'); + <br /> + <script type="text/javascript" src="'.$roscms_intern_webserver_roscms.'js/cms_website-init.js"></script>'); }
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_Nopermission.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_Nopermission.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_Nopermission.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -28,11 +28,13 @@ public function body( ) { echo_strip(' - <h1>No Permission</h1> - <h2>No Permission</h2> - <p>You have <strong>no permission</strong> to use this part of the homepage!</p> - <p>You <strong>need a higher account level</strong> to access this page. Please contact a member of the administrator group if you want more information.</p> - <a href="');echo @$_SERVER['HTTP_REFERER'].'">Back</a>'; + <div> + <h1>No Permission</h1> + <h2>No Permission</h2> + <p>You have <strong>no permission</strong> to use this part of the homepage!</p> + <p>You <strong>need a higher account level</strong> to access this page. Please contact a member of the administrator group if you want more information.</p> + <a href="');echo @$_SERVER['HTTP_REFERER'];echo_strip('">Back</a> + </div>'); }
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -66,7 +66,7 @@
echo_strip(' <table style="border:0" width="100%" cellpadding="0" cellspacing="0"> - <tr valign="top"> + <tr style="vertical-align: top;"> <td style="width:147px" id="leftNav"> <div class="navTitle">Navigation</div> <ol> @@ -85,9 +85,9 @@ <li title="'.$roscms_intern_login_check_username.'"> Nick: '.substr($roscms_intern_login_check_username, 0, 9).'</li> <li><a href="'.$roscms_SET_path_ex.'my/">My Profile</a></li> <li><a href="'.$roscms_SET_path_ex.'search/">User Search</a></li> - <li><a href="'.$roscms_intern_webserver_pages.'peoplemap/" target="_blank">User Map</a></li>'); + <li><a href="'.$roscms_intern_webserver_pages.'peoplemap/">User Map</a></li>'); if ($roscms_security_level > 0) { - echo '<li><a href="'.$roscms_intern_webserver_roscms.'?page=data&branch=welcome">RosCMS Interface</a></li>'; + echo '<li><a href="'.$roscms_intern_webserver_roscms.'?page=data&branch=welcome">RosCMS Interface</a></li>'; } echo_strip(' <li><a href="?page=logout">'.$roscms_langres['Logout'].'</a></li> @@ -121,7 +121,7 @@ <div class="navTitle">Language</div> <ol> <li> - <div align="center"> + <div style="text-align:center;"> <select id="select" size="1" name="select" class="selectbox" style="width:140px" onchange="'."window.location.href = '".$roscms_SET_path_ex.$rdf_uri_str."?lang=' + this.options[this.selectedIndex].value".'"> <optgroup label="current language">');
@@ -156,8 +156,7 @@ </ol> <br /> </td> - <td id="content"> - <div class="contentSmall">'); + <td id="content">'); } // end of member function navigation
} // end of HTML_User
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Activate.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Activate.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Activate.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -119,7 +119,7 @@ </div>
<div class="login-form"> - <label for="useremail"'.((isset($_POST['registerpost']) && (EMail::isValid($_POST['useremail']) || !$mail_exists)) ? ' style="color:#FF0000;"' : '').'>Your E-Mail Address</label> + <label for="useremail"'.((isset($_POST['registerpost']) && (EMail::isValid($_POST['useremail']) || !$mail_exists)) ? ' style="color:red;"' : '').'>Your E-Mail Address</label> <input name="useremail" type="text" class="input" tabindex="4" id="useremail"'.(isset($_POST['useremail']) ? 'value="'.$_POST['useremail'].'"' : '').' size="50" maxlength="50" /> </div>
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Login.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Login.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Login.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -34,6 +34,9 @@ public function __construct( ) { session_start(); + + // register js files + $this->register_js('md5.js'); parent::__construct(); }
@@ -215,7 +218,6 @@ if (isset($_GET['sec']) && $_GET['sec'] == "security") { $random_string_security = self::makeKey(); setcookie($rdf_login_cookie_seckey, $random_string_security, 0, '/', Cookie::getDomain()); - echo '<script language="javascript" src="js/md5.js"></script>'; } else { setcookie($rdf_login_cookie_seckey, '', time() - 3600, '/', Cookie::getDomain()); @@ -229,24 +231,27 @@ echo '<form action="'.$roscms_SET_path_ex.'login/" method="post">';
if ($target_clean != '' ) { - echo '<input type="hidden" name="target" value="'.$target_clean.'" />'; + echo_strip(' + <div style="display:none;"> + <input type="hidden" name="target" value="'.$target_clean.'" /> + </div>'); }
echo_strip(' <h1>Login</h1> <div class="u-h1">Login to '.$rdf_name.'</div> <div class="u-h2">You don't have a '.$rdf_name.' account yet? <a href="'.$roscms_SET_path_ex.'register/">Join now</a>, it's free and just takes a minute.</div> - <div align="center"> - <div style="background: #e1eafb none repeat scroll 0%; width: 300px;"> - <div class="corner1"> - <div class="corner2"> - <div class="corner3"> - <div class="corner4"> - <div style="text-align:center; padding: 4px;"> - <div class="login-title">'.((isset($_GET['sec']) && $_GET['sec'] == 'security') ? 'Secure ' : '').'Login</div> - <div class="login-form"> - <label for="'.$rdf_login_cookie_usrname.'">Username</label> - <input name="'.$rdf_login_cookie_usrname.'" type="text" class="input" tabindex="1" id="'.$rdf_login_cookie_usrname.'" '); + <div> + <div style="margin: 0px auto; background: #e1eafb none repeat scroll 0%; width: 300px;"> + <div class="corner1"> + <div class="corner2"> + <div class="corner3"> + <div class="corner4"> + <div style="text-align:center; padding: 4px;"> + <div class="login-title">'.((isset($_GET['sec']) && $_GET['sec'] == 'security') ? 'Secure ' : '').'Login</div> + <div class="login-form"> + <label for="'.$rdf_login_cookie_usrname.'">Username</label> + <input name="'.$rdf_login_cookie_usrname.'" type="text" class="input" tabindex="1" id="'.$rdf_login_cookie_usrname.'" '); if (isset($_POST[$rdf_login_cookie_usrname])) { echo 'value="'.$_POST[$rdf_login_cookie_usrname].'"'; } @@ -299,7 +304,7 @@ </div>'); }
- echo '<div style="margin:10px">'; + echo '<div style="margin:10px;text-align:center;">';
if (isset($_GET['sec']) && ($_GET['sec'] == '' || $_GET['sec'] == 'standard')) { echo '<a href="'.$roscms_SET_path_ex.'login/?sec=security'.(($target_clean != '') ? '&target='.urlencode($target_clean) : '').'">Use enhanced security</a>'; @@ -309,8 +314,9 @@ }
echo_strip(' - </div> - <a href="'.$roscms_SET_path_ex.'login/lost/">Lost username or password?</a> + <br /> + <a href="'.$roscms_SET_path_ex.'login/lost/">Lost username or password?</a> + </div> </div> </form>'); } // end of member function
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_LostPassword.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_LostPassword.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_LostPassword.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -74,8 +74,8 @@
echo_strip(' <form action="'.$roscms_SET_path_ex.'login/lost/" method="post"> - <div align="center"> - <div style="background: #e1eafb none repeat scroll 0%; width: 300px;"> + <div style="text-align: center;"> + <div style="margin:0px auto; background: #e1eafb none repeat scroll 0%; width: 300px;"> <div class="corner1"> <div class="corner2"> <div class="corner3"> @@ -223,7 +223,6 @@ }
echo_strip(' - </div> </div> </div> </div>
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Profile.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -38,7 +38,7 @@ { require('login.php'); $this->search = $search; - parent::__construct( $page_title); + parent::__construct( $page_title ); }
@@ -149,17 +149,17 @@
// begin output echo_strip(' - <h1>myReactOS Profile</h1> + <div class="contentSmall"><h1>myReactOS Profile</h1></div> <div class="u-h1">'.(($profile['user_fullname'] != '') ? $profile['user_fullname'].' ('.$profile['user_name'].')' : $profile['user_name']).'</div> <div class="u-h2">A person who joined '.$rdf_name.' on '.Date::getLocal($profile['user_register']).'.</div> <br /> - <div align="center"> - <div style="background: #e1eafb none repeat scroll 0%; width: 300px;"> + <div style="text-align:center;"> + <div style="margin: 0px auto; background: #e1eafb none repeat scroll 0%; width: 300px;"> <div class="corner1"> <div class="corner2"> <div class="corner3"> <div class="corner4"> - <div style="text-align:center; padding-top: 4px; padding-bottom: 4px; padding-left: 4px; padding-right: 4px;"> + <div style="text-align:center; padding: 4px;"> <div class="login-title">myReactOS Profile</div>
<div class="login-form"> @@ -227,7 +227,7 @@ echo_strip(' <div class="login-form"> <div class="u-desc">Private Website</div> - <div class="u-title"><a href="'.$profile['user_website'].'" target="_blank" rel="nofollow">.'.htmlspecialchars($profile['user_website']).'</a></div> + <div class="u-title"><a href="'.$profile['user_website'].'" rel="nofollow">.'.htmlspecialchars($profile['user_website']).'</a></div> </div>'); }
@@ -261,8 +261,7 @@ // Location echo_Strip(' <div class="login-form"> - <label for="useroccupation">Location</label> - <a href="'.$roscms_intern_webserver_pages.'peoplemap/" target="_blank" style="color:#333333 !important; text-decoration:underline; font-weight:bold;">'.($profile['user_id']==$roscms_intern_account_id ? 'My ' : '').'Location on the Map</a> + <a href="'.$roscms_intern_webserver_pages.'peoplemap/" style="color:#333333 !important; text-decoration:underline; font-weight:bold;">'.($profile['user_id']==$roscms_intern_account_id ? 'My ' : '').'Location on the Map</a> </div> </div>');
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -31,11 +31,11 @@ * * @access public */ - public function __construct( $page_title = '') + public function __construct() { require('login.php'); session_start(); - parent::__construct( $page_title); + parent::__construct(); }
@@ -64,10 +64,10 @@
if ($activation_code != '' && strlen($activation_code) > 6) { echo_strip(' - <h1><a href="<?php echo $roscms_SET_path_ex; ?>my/">myReactOS</a> > <a href="<?php echo $roscms_SET_path_ex; ?>my/edit/">Edit My Profile</a> > Activate E-Mail Address</h1> + <h1><a href="'.$roscms_SET_path_ex.'my/">myReactOS</a> > <a href="'.$roscms_SET_path_ex.'my/edit/">Edit My Profile</a> > Activate E-Mail Address</h1> <div class="u-h1">Activate E-Mail Address</div> <div class="u-h2"> - So you have a new email address and would like to keep your <?php echo $rdf_name; ?> account up-to-date? That is a very good idea. To confirm your email address change, please enter your new email address again. + So you have a new email address and would like to keep your '.$rdf_name.' account up-to-date? That is a very good idea. To confirm your email address change, please enter your new email address again. </div>'); } else { @@ -79,8 +79,8 @@
echo_strip(' <form action="'.$roscms_SET_path_ex.'my/edit/" method="post"> - <div align="center"> - <div style="background: #e1eafb none repeat scroll 0%; width: 300px;"> + <div style="text-align:center;"> + <div style="margin: 0px auto; background: #e1eafb none repeat scroll 0%; width: 300px;"> <div class="corner1"> <div class="corner2"> <div class="corner3"> @@ -207,7 +207,7 @@ echo '<div>Password changed.</div>'; }
- echo '<div><a href="'.$roscms_SET_path_ex.'my/" style="color:#FF0000 !important; text-decoration:underline;">My Profile</a></div>'; + echo '<div><a href="'.$roscms_SET_path_ex.'my/" style="color:red !important; text-decoration:underline;">My Profile</a></div>';
ROSUser::syncSubsystems($profile['user_id']);
@@ -217,13 +217,13 @@ echo_strip(' <div class="login-title">Activate E-Mail Address</div> <div class="login-form"> - <label for="useremail"'.(isset($_POST['registerpost']) ? ' style="color:#FF0000;"' : '').'>New E-Mail Address</label> + <label for="useremail"'.(isset($_POST['registerpost']) ? ' style="color:red;"' : '').'>New E-Mail Address</label> <input name="useremail" type="text" class="input" tabindex="4" id="useremail" value="" size="50" maxlength="50" /> </div> <div class="login-button"> <input type="submit" name="submit" value="Save" tabindex="16" /> <br /> - <input type="button" onclick="'."window.location='".$roscms_SET_path_ex."'".' tabindex="17" value="Cancel" name="cancel" style="color:#777777;" /> + <input type="button" onclick="'."window.location='".$roscms_SET_path_ex."'".'" tabindex="17" value="Cancel" name="cancel" style="color:#777777;" /> <input name="registerpost" type="hidden" id="registerpost" value="reg" /> </div>'); } @@ -233,9 +233,10 @@ <div style="font-style:italic">* not required</div> <div class="login-form"> <label for="username">Username</label> - <input name="username" type="text" class="input" id="username" value="'.$profile['user_name'].'" size="50" maxlength="50" disabled="disabled" value="Klemens Friedl" /> + <input name="username" type="text" class="input" id="username" value="'.$profile['user_name'].'" size="50" maxlength="50" disabled="disabled" /> <br /> <span style="color:#817A71;">You cannot change your username.</span> + </div> v>
<div class="login-form"> @@ -340,22 +341,22 @@ </div> <div class="login-form"> <label for="useroccupation">Location *</label> - <a href="'.$roscms_intern_webserver_pages.'peoplemap/" target="_blank" style="color:#333333 !important; text-decoration:underline; font-weight:bold;">My Location on the Map</a> + <a href="'.$roscms_intern_webserver_pages.'peoplemap/" style="color:#333333 !important; text-decoration:underline; font-weight:bold;">My Location on the Map</a> </div>
<div class="login-options"> <fieldset> <legend style="color:#817A71;margin-bottom: 10px;"> Login Settings </legend> - <input name="loginoption1" style="width:auto;" type="checkbox" id="loginoption1" value="true"'.(isset($_POST['loginoption1']) || (empty($_POST['registerpost']) && $profile['user_setting_multisession'] == 'true') ? 'checked' : '').' tabindex="11" /> + <input name="loginoption1" style="width:auto;" type="checkbox" id="loginoption1" value="true"'.(isset($_POST['loginoption1']) || (empty($_POST['registerpost']) && $profile['user_setting_multisession'] == 'true') ? ' checked="checked"' : '').' tabindex="11" /> <label style="display:inline;" for="loginoption1">Multisession</label> <br /> - <input name="loginoption2" style="width:auto;" type="checkbox" id="loginoption2" value="true"'.(isset($_POST['loginoption2']) || (empty($_POST['registerpost']) && $profile['user_setting_browseragent'] == 'true') ? 'checked' : '').' tabindex="12" /> + <input name="loginoption2" style="width:auto;" type="checkbox" id="loginoption2" value="true"'.(isset($_POST['loginoption2']) || (empty($_POST['registerpost']) && $profile['user_setting_browseragent'] == 'true') ? ' checked="checked"' : '').' tabindex="12" /> <label style="display:inline;" for="loginoption2">Browser Agent Check</label> <br /> - <input name="loginoption3" style="width:auto;" type="checkbox" id="loginoption3" value="true"'.((isset($_POST['loginoption3']) || (empty($_POST['registerpost']) && $profile['user_setting_ipaddress'] == 'true')) ? 'checked' : '').' tabindex="13" /> + <input name="loginoption3" style="width:auto;" type="checkbox" id="loginoption3" value="true"'.((isset($_POST['loginoption3']) || (empty($_POST['registerpost']) && $profile['user_setting_ipaddress'] == 'true')) ? ' checked="checked"' : '').' tabindex="13" /> <label style="display:inline;" for="loginoption3">IP Address Check</label> <br /> - <input name="loginoption4" style="width:auto;" type="checkbox" id="loginoption4" value="true"'.((isset($_POST['loginoption4']) || (empty($_POST['registerpost']) && $profile['user_setting_timeout'] == 'true')) ? 'checked' : '').' tabindex="14" /> + <input name="loginoption4" style="width:auto;" type="checkbox" id="loginoption4" value="true"'.((isset($_POST['loginoption4']) || (empty($_POST['registerpost']) && $profile['user_setting_timeout'] == 'true')) ? ' checked="checked"' : '').' tabindex="14" /> <label style="display:inline;" for="loginoption4">Log me on automatically</label> </fieldset> </div>
Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Register.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros... ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Register.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_Register.class.php [iso-8859-1] Wed Nov 19 05:15:29 2008 @@ -67,8 +67,8 @@ </ul>
<form action="'.$roscms_SET_path_ex.'register/" method="post"> - <div align="center"> - <div style="background: #e1eafb none repeat scroll 0%; width: 300px;"> + <div> + <div style="margin: 0px auto; background: #e1eafb none repeat scroll 0%; width: 300px;"> <div class="corner1"> <div class="corner2"> <div class="corner3"> @@ -231,6 +231,7 @@ <input name="usercaptcha" type="text" class="input" tabindex="7" id="usercaptcha" size="50" maxlength="50" /> <script type="text/javascript">');echo " <!-- + var BypassCacheNumber = 0;
function CaptchaReload() @@ -239,7 +240,8 @@ document.getElementById('captcha').src = '".$roscms_SET_path_ex.">register/captcha/' + BypassCacheNumber; }
- document.write('<br /><span style="color:#817A71; ">If you can't read this, try <a href="javascript:CaptchaReload()">another one</a>.</span>'); + document.write(<![CDATA['<br /><span style=\"color:#817A71; \">If you can't read this, try <a href=\"javascript:CaptchaReload()\">another one</a>.</span>']]>); + -->";echo_strip(' </script> <img id="captcha" src="'.$roscms_SET_path_ex.'register/captcha" style="padding-top:10px;" alt="If you can\'t read this, try another one or email '.$rdf_support_email_str.' for help." title="Are you human?" />
-
dgoette＠svn.reactos.org