Changeset 1847


Ignore:
Timestamp:
10/07/2010 11:56:56 AM (20 months ago)
Author:
Xiping.Wang
Message:

[trunk] 1.change logged layout to float. 2.Signup form refactor

Location:
trunk
Files:
3 deleted
37 edited
9 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/_InstallationResources

  • trunk/_InstallationResources/omconfig.php

    r1820 r1847  
    3838 
    3939# [ omCollab Version - increment manually - will appear as title on omCollab logo] 
    40 define( 'OMCOLLAB_VERSION'                         , '1.400.1' ); 
     40define( 'OMCOLLAB_VERSION'                         , '1.400.2' ); 
    4141 
    4242# [ ... ] 

  • trunk/blogs

  • trunk/blogs/wp-content/plugins/wp-page-numbers/default/wp-page-numbers.css

    r1827 r1847  
    2424#wp_page_numbers ul { 
    2525        width: 100%; 
     26        overflow: hidden; 
    2627} 
    2728#wp_page_numbers li { 
    2829        float: left; 
    2930        display: block; 
    30     padding-left: 2px !important; 
     31    padding-left: 10px !important; 
    3132} 
    3233 
    … …  
    5253        font-family: Arial; 
    5354        color: #aaa; 
    54         padding: 3px; 
    55         padding-left: 5px; 
    56         padding-right: 5px; 
    5755        border-top: 2px solid #fff; 
    5856        border-bottom: 2px solid #fff; 

  • trunk/blogs/wp-content/themes/mike2

  • trunk/blogs/wp-content/themes/mike2/archive.php

    r1820 r1847  
    1414        <li class="tab-seperator"><div class="blogdashboarddisable blog-size" title="You should be logged in."></div></li> 
    1515    <?php } ?> 
    16     <li><a href="<?php echo OMCOLLAB_RSS_ADDRESS ?>" rel="alternate" type="application/rss+xml" class="blogsubscribe blog-size">&nbsp;</a></li> 
     16    <li class="tab-seperator"><a href="<?php echo OMCOLLAB_RSS_ADDRESS ?>" rel="alternate" type="application/rss+xml" class="blogsubscribe blog-size">&nbsp;</a></li> 
    1717</ul> 
    1818<!-- End 4 main tabs in middle area --> 

  • trunk/blogs/wp-content/themes/mike2/footer.php

    r1820 r1847  
    140140                                </tr> 
    141141                        </table> 
    142                 </div> 
    143                 <div class="main-bg-bottom"><div class="main-corner-bg"></div></div> 
     142                </div></div> 
     143                <div class="main-bg-bottom"><div class="innerbottomwrapper"></div><div class="main-corner-bg"></div></div> 
    144144<?php 
    145145        include( FS_COMMON_SKIN_DIRECTORY . "/footer.php" ); 

  • trunk/blogs/wp-content/themes/mike2/header.php

    r1667 r1847  
    1919<body> 
    2020<?php include( FS_COMMON_SKIN_DIRECTORY . "/header.php" ); ?> 
    21 <div class="main-bg-top"></div> 
    22 <div class="main-wrapper"> 
     21<div class="main-bg-top"><div></div></div> 
     22<div class="main-wrapper"><div class="innerwrapper"> 
    2323        <table cellpadding="0" cellspacing="0" width="100%"> 
    2424                <tr> 

  • trunk/blogs/wp-content/themes/mike2/index.php

    r1820 r1847  
    1414        <li class="tab-seperator"><div class="blogdashboarddisable blog-size" title="You should be logged in."></div></li> 
    1515    <?php } ?> 
    16     <li><a href="<?php echo OMCOLLAB_RSS_ADDRESS ?>" rel="alternate" type="application/rss+xml" class="blogsubscribe blog-size">&nbsp;</a></li> 
     16    <li class="tab-seperator"><a href="<?php echo OMCOLLAB_RSS_ADDRESS ?>" rel="alternate" type="application/rss+xml" class="blogsubscribe blog-size">&nbsp;</a></li> 
    1717</ul> 
    1818<!-- End 4 main tabs in middle area --> 

  • trunk/blogs/wp-content/themes/mike2/style.css

    r1820 r1847  
    134134 
    135135/* Begin Lists */ 
    136 .entry {clear: both;} 
     136.entry {} 
    137137.entry ul { 
    138138        margin-left: 0px; 

  • trunk/bookmarks/index.php

    r1778 r1847  
    8080//zero-rated pos in array shld be ( n * row ) where n = $iNumberOfBlocksPerRow - see bottom.inc.php 
    8181//to ensure it is always on the right (it is hidden if empty therfore would leave a 'hole') 
    82 //$aTemplateVars['aBottomBlocks']  = array('recent-bookmarks','recent-comments','zero-rated','featured-contributor','top-contributors'); // changed by zhongzhen on 2010-08-03 
    83 $aTemplateVars['aBottomBlocks']  = array('recent-bookmarks','recent-comments','zero-rated'); // changed by zhongzhen on 2010-08-14 
     82$aTemplateVars['aBottomBlocks']  = array('recent-bookmarks','recent-comments','zero-rated','featured-contributor','top-contributors'); // changed by zhongzhen on 2010-08-03 
     83//$aTemplateVars['aBottomBlocks']  = array('recent-bookmarks','recent-comments','zero-rated'); changed by zhongzhen on 2010-08-14 
    8484 
    8585$aTemplateVars['range']          = 'all'; 

  • trunk/bookmarks/manage.php

    r1784 r1847  
    2828// Sidebar 
    2929$aTemplateVariables['sidebar_blocks'] = array( 'profile', 'subscribe', 'common', 'partners' ); // Changed by zhongzhen on 2010-08-15. Added "subscribe" into sidebar 
    30 $aTemplateVariables['aBottomBlocks']  = array('recent-bookmarks','recent-comments','zero-rated'); // Added by zhongzhen on 2010-08-15 
     30$aTemplateVariables['aBottomBlocks']  = array('recent-bookmarks','recent-comments','zero-rated','featured-contributor','top-contributors'); // Added by zhongzhen on 2010-09-01 
    3131$oTemplateService->loadTemplate('managebookmark.tpl', $aTemplateVariables); 
    3232?> 

  • trunk/bookmarks/templates_omB/bottom.inc.php

    r1667 r1847  
    66                </tr> 
    77        </table> 
    8 </div> 
    9 <div class="main-bg-bottom"><div class="main-corner-bg"></div></div> 
     8</div></div> 
     9<div class="main-bg-bottom"><div class="innerbottomwrapper"></div><div class="main-corner-bg"></div></div> 
    1010 
    1111<?php include( FS_COMMON_SKIN_DIRECTORY . '/footer.php'); ?> 

  • trunk/bookmarks/templates_omB/sort.tpl.php

    r1778 r1847  
    1515 
    1616        <?php if ($aSortStyles['title'] != "") { ?> 
    17                 <li style="padding-left: 22px;"><a href="?sort=title_asc" class="bookmark-by-title-selected bookmark-size">&nbsp;</a></li> 
     17                <li class="tab-seperator"><a href="?sort=title_asc" class="bookmark-by-title-selected bookmark-size">&nbsp;</a></li> 
    1818        <?php } else { ?> 
    19                 <li style="padding-left: 22px;"><a href="?sort=title_asc" class="bookmark-by-title bookmark-size">&nbsp;</a></li> 
     19                <li class="tab-seperator"><a href="?sort=title_asc" class="bookmark-by-title bookmark-size">&nbsp;</a></li> 
    2020        <?php } ?> 
    2121</ul> 

  • trunk/bookmarks/templates_omB/top.inc.php

    r1824 r1847  
    5353?> 
    5454 
    55 <div class="main-bg-top"></div> 
    56 <div class="main-wrapper"> 
     55<div class="main-bg-top"><div></div></div> 
     56<div class="main-wrapper"><div class="innerwrapper"> 
    5757<?php 
    5858        if (isset($error))    echo '<p class="error">'. $error ."</p>\n"; 

  • trunk/common/skins/mike2/common.css

    r1827 r1847  
    88body { font-size: 12px; font-family: Arial, Helvetica, sans-serif; color: #333333; background: #c0deed url(images/background.jpg) repeat-x;  
    99                min-width: 970px; width: expression(document.documentElement.clientWidth < 971? "970px" : "auto"); } 
    10 .wrapper {width: 970px; margin: 0 auto; } 
     10.wrapper {margin: 0 10px; min-width: 1020px;} 
     11.wrapper_public {margin: 0 auto; width: 970px;} 
    1112.clear { clear:both; text-indent:-9999px; height: 0px; overflow: hidden;} 
    1213p { margin: 10px 0; line-height: 1.4em;} 
    … …  
    3536.top-link-wrapper ul li span {display: block; padding: 0px 10px; color: white; text-decoration: none;} 
    3637.top-link-wrapper a {color: white; text-decoration: none;} 
    37 .top-link-wrapper a:hover {text-decoration: underline;} 
     38.top-link-wrapper a:hover {} 
    3839.login { width: 60px; text-align: center; background-color: #c28d4c; font-weight: bold; } 
    3940.linkover {background-color: #2d5779;} 
    … …  
    5051*/ 
    5152 
    52 .menubar-left {width: 4px; height: 52px; float: left; background: url(images/menubar-left.png) no-repeat;} 
    53 .menubar-right {width: 4px; height: 52px; float: right; background: url(images/menubar-right.png) no-repeat;} 
    54 .menubar-middle { background: url(images/menubar-middle.png) repeat-x; float: left; width: 962px; _overflow: hidden;} 
     53.menubar-left {width: 4px; height: 52px; background: url(images/menubar-left.png) no-repeat;} 
     54.menubar-right {width: 4px; height: 52px; background: url(images/menubar-right.png) no-repeat;} 
     55.menubar-middle { background: url(images/menubar-middle.png) repeat-x;} 
    5556.menu-ul {height: 52px; margin: 0px; float: left; width: 692px;} 
    5657.menu-ul .li-normal {height: 100%; list-style-type: none; float: left; font-size: 16px; font-family: Arial; margin: 0px;} 
    … …  
    7273.menu-ul .li-over a .menubutton-right span {font-weight: bold; height: 47px; line-height: 47px; color: white; display: block; cursor: pointer; padding: 0px 13px; background: url(images/menubutton-middle.jpg); float: left; } 
    7374 
    74 .main-bg-top {height: 10px; overflow: hidden; width: 970px; background: url(images/main-bg-top.png) no-repeat; margin-top: 5px;} 
    75 .main-bg-bottom {height: 10px; width: 970px; background: url(images/main-bg-bottom.png) no-repeat; margin-bottom: 45px; position: relative;} 
     75.main-bg-top {margin-top: 5px; background: url(images/main-bg-top-right.png) no-repeat; background-position: top right;} 
     76.main-bg-top div {margin-right: 10px; background: url(images/main-bg-top-left.png) no-repeat; height: 10px; overflow: hidden; } 
     77.main-bg-bottom {background: url(images/main-bg-bottom-right.png) no-repeat; margin-bottom: 45px; position: relative; background-position: top right;} 
     78.main-bg-bottom .innerbottomwrapper {background: url(images/main-bg-bottom-left.png) no-repeat; margin-right: 10px; height: 10px; } 
    7679.main-corner-bg {width: 95px; height: 57px; background: url(images/main-corner-bg.png) no-repeat; position: absolute; right: -5px; bottom: -6px;} 
    77 .main-wrapper {min-height: 450px; background: url(images/main-bg-middle.png) repeat-y;} 
     80.main-wrapper {background: url(images/main-bg-middle-right.png) repeat-y; background-position: top right; } 
     81.main-wrapper .innerwrapper {min-height: 450px; background: url(images/main-bg-middle-left.png) repeat-y; margin-right: 10px;} 
    7882.main-bg-top-public {height: 10px; overflow: hidden; width: 970px; background: url(images/main-bg-top-small.png) no-repeat; margin-top: 5px; width: 772px;} 
    7983.main-bg-bottom-public {height: 10px; width: 970px; background: url(images/main-bg-bottom-small.png) no-repeat; margin-bottom: 45px; position: relative; width: 772px;} 
    … …  
    111115.footer-wrapper .link-wrapper a:hover {text-decoration: underline !important;} 
    112116.footer-wrapper td {height: 63px;} 
     117.footer-icon {display: block; width: 28px; height: 30px; float: left; padding-left: 5px;} 
    113118 
    114119#column-one {vertical-align: top; width: 178px;} 
    115 #column-three {vertical-align: top; width: 199px;} 
     120#column-three {vertical-align: top; width: 189px;} 
    116121.contentWrapper { vertical-align: top; margin: 0;  padding: 0px 17px; border: none; font-family: Verdana,Helvetica,Arial,sans-serif; } 
    117122 
    … …  
    276281.portlet_ .portletContent p {margin: 0px;} 
    277282 
    278 .portlet2 {clear: both; margin-bottom:10px; z-index: 100; margin-right: 10px; width: 191px; overflow: hidden;} 
     283.portlet2 {clear: both; margin-bottom:10px; z-index: 100; width: 191px; overflow: hidden;} 
    279284.portlet2 .portletHeader {color:#FFF; overflow:hidden; height:34px; background-color: #40648F; background: url(images/portlet2-title.png) no-repeat;} 
    280285.portlet2 .portletHeader .portletTitle {line-height:34px; float:left; padding-left:12px; font-weight:bold; font-size:13px; color: #666666; } 
    … …  
    306311.skill-portlet .middle .content .skills .button {text-align: center; margin-top: 20px;} 
    307312.skill-portlet .middle .content .skills .button a {display: block;} 
    308 .skill-portlet .middle .content .skills li {border-bottom: 1px solid #7fb3cc; padding: 8px 5px; color: #ddeef6; font-size: 11px;} 
     313.skill-portlet .middle .content .skills li {border-bottom: 1px solid #7fb3cc; padding: 8px 5px; color: #ddeef6; font-size: 11px; overflow: hidden;} 
    309314.skill-description {float: left; width: 125px; height: 15px; overflow: hidden;} 
    310315.skill-number {float: left; width: 34px; height: 15px; color: white; text-align: center; line-height: 15px; font-weight: bold; background: url(images/skill-portlet-number.png) no-repeat;} 
    … …  
    369374.main-tabs {overflow: hidden; margin-bottom: 20px; list-style: none;} 
    370375.main-tabs li {float: left;  padding-left: 0px !important; overflow: hidden;} 
    371 .main-tabs li a {overflow: hidden; float: left; cursor: pointer; } 
     376.main-tabs li a {overflow: hidden; float: left; cursor: pointer; background-position: top center; } 
    372377.tab-seperator { background: url(images/tab-seperator.jpg) no-repeat; background-position: right top; padding-right: 44px;} 
    373 .tab-seperator a, .tab-seperator a:hover  { background-position: top center; } 
    374378.main-tabs li div {float: left; overflow: hidden;} 
    375 .profile-content-bg-top {background: url(images/profile-content-bg-top.png) no-repeat; height: 5px; overflow: hidden;} 
    376 .profile-content-bg-middle {background: url(images/profile-content-bg-middle.png) repeat-y;} 
     379.profile-content-bg-top {/*background: url(images/profile-content-bg-top.png) no-repeat; height: 5px; overflow: hidden;*/} 
     380.profile-content-bg-middle { /* background: url(images/profile-content-bg-middle.png) repeat-y; */ /*background-color: #fafafa; border: 1px solid #dddddd; */} 
    377381.profile-content-bg-bottom {background: url(images/profile-content-bg-bottom.png) no-repeat; height: 5px; position: relative;} 
    378382.profile-group {background: url(images/profile-group-bg.png) repeat-x; margin: 0px 3px; padding: 10px; overflow: hidden; font-size: 12px;} 
    … …  
    381385.profile-group .group-title {font-size: 18px; color: #333333; margin-top: 0px; margin-bottom: 5px;} 
    382386.edit-link {font-size: 9px; } 
    383 .group-inner-top {height: 10px; background: url(images/group-inner-top.png) no-repeat; } 
    384 .group-inner-middle {background: url(images/group-inner-middle.png) repeat-y; padding: 0px 10px;} 
    385 .group-inner-bottom {background: url(images/group-inner-bottom.png) no-repeat; height: 10px;} 
     387.group-inner-top {height: 10px; background: url(images/group-inner-top.png) no-repeat; width: 532px;} 
     388.group-inner-middle {background: url(images/group-inner-middle.png) repeat-y; padding: 0px 10px; width: 512px;} 
     389.group-inner-bottom {background: url(images/group-inner-bottom.png) no-repeat; height: 10px; width: 532px;} 
    386390.group-inner-middle td {vertical-align: top; padding: 5px;} 
    387391.group-inner-middle .label {font-size: 11px; font-weight: bold; color: #006699; width: 40%;} 
    … …  
    432436.bookmark-size {display: block; width: 148px; height: 106px;} 
    433437.bookmark-by-popularity {background: url(images/bookmark-by-popularity-off.png) no-repeat; background-position: top center; text-decoration: none;} 
    434 .bookmark-by-popularity:hover {background: url(images/bookmark-by-popularity-on.png) no-repeat; text-decoration: none;} 
     438.bookmark-by-popularity:hover {background: url(images/bookmark-by-popularity-on.png) no-repeat; text-decoration: none; background-position: top center;} 
    435439.bookmark-by-popularity-selected {background: url(images/bookmark-by-popularity-on.png) no-repeat; text-decoration: none;} 
    436440.bookmark-by-popularity-selected:hover {text-decoration: none;} 
    437441.bookmark-by-date {background: url(images/bookmark-by-date-off.png) no-repeat; text-decoration: none;} 
    438 .bookmark-by-date:hover {background: url(images/bookmark-by-date-on.png) no-repeat; text-decoration: none;} 
     442.bookmark-by-date:hover {background: url(images/bookmark-by-date-on.png) no-repeat; text-decoration: none;  background-position: top center;} 
    439443.bookmark-by-date-selected {background: url(images/bookmark-by-date-on.png) no-repeat; text-decoration: none;} 
    440444.bookmark-by-date-selected:hover {text-decoration: none;} 
    441445.bookmark-by-title {background: url(images/bookmark-by-title-off.png) no-repeat; text-decoration: none;} 
    442 .bookmark-by-title:hover {background: url(images/bookmark-by-title-on.png) no-repeat; text-decoration: none;} 
     446.bookmark-by-title:hover {background: url(images/bookmark-by-title-on.png) no-repeat; text-decoration: none;  background-position: top center;} 
    443447.bookmark-by-title-selected {background: url(images/bookmark-by-title-on.png) no-repeat; text-decoration: none;} 
    444448.bookmark-by-title-selected:hover {text-decoration: none;} 
    … …  
    472476.calendar-next {float: right; width: 50px; font-weight: bold; padding-right: 10px; text-align: right; margin-top: 5px;} 
    473477.calendar-info {background: url(images/calendar-info-bg.png) no-repeat; width: 183px; height: 85px; margin-left: 3px; color: white; text-align: center; overflow: hidden;} 
    474 .calendar-info .today {margin: 10px; font-size: 12px;} 
     478.calendar-info .today {margin: 10px; font-size: 11px;} 
    475479.calendar-info .month {font-size: 18px; padding-right: 10px;} 
    476480.calendar-info .year {font-size: 30px; font-weight: bold;} 
    … …  
    491495.category-number {float: right; width: 26px; height: 15px; color: white; text-align: center; line-height: 15px; font-weight: bold; background: url(images/category-number-bg.png) no-repeat;} 
    492496 
    493 .post {width:550px; overflow: hidden; border-bottom: 1px solid #cccccc; padding-top: 15px; padding-bottom: 5px; margin-bottom: 20px;} 
     497.post { overflow: hidden; border-bottom: 1px solid #cccccc; padding-top: 15px; padding-bottom: 5px; margin-bottom: 20px;} 
    494498.post h1 {border: 0px;} 
    495 .post .photo {background: url(images/blog-post-photo-bg.png) no-repeat; width: 88px; height: 118px; overflow: hidden; float: left; text-align: center; font-size: 10px; font-family: Arial;} 
     499.post .photo {float: left; background: url(images/blog-post-photo-bg.png) no-repeat; width: 88px; height: 118px; overflow: hidden; float: left; text-align: center; font-size: 10px; font-family: Arial;} 
    496500.post .photo div {margin-right: 10px; margin-left: 3px;} 
    497 .post .main-content {float: right; width: 450px; } 
     501.post .main-content {margin-left: 100px;} 
    498502.post .main-content h1 a {font-family: Arial; font-weight: normal; color: #333333;} 
    499503.post .meta {color: #4F81BD;    background-color: #ebf5f9; font-size: 11px; padding: 5px 10px;}    

  • trunk/common/skins/mike2/footer.php

    r1667 r1847  
    2525                                <a href="<?php echo $omCollabAppURLs[ WIKI ] ?>Sitemap">Sitemap</a> 
    2626                        </td> 
    27                         <td width="250px;" align="right"> 
    28                                 <div> 
    29                                         <a href="#"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/facebook-icon.png" alt="Facebook" class="png_img"/></a>&nbsp;&nbsp; 
    30                                         <a href="#"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/twitter-icon.png" alt="Twitter" class="png_img"/></a>&nbsp;&nbsp; 
    31                                         <a href="#"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/linkedin-icon.png" alt="LinkedIn" class="png_img"/></a>&nbsp;&nbsp; 
    32                                         <a href="#"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/delicious-icon.png" alt="Delicious" class="png_img"/></a>&nbsp;&nbsp; 
    33                                         <a href="#"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/digg-icon.png" alt="Digg" class="png_img"/></a>&nbsp;&nbsp; 
    34                                         <a href="#"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/stumbleupon-icon.png" alt="StumbleUpon" class="png_img"/></a>&nbsp;&nbsp; 
    35                                         <a href="#"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/rss-icon.png" alt="Rss" class="png_img"/></a> 
     27                        <td width="250px;"> 
     28                                <div style="overflow: hidden;"> 
     29                                        <a href="www.google.com" class="footer-icon"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/facebook-icon.png" alt="Facebook" class="png_img"/></a> 
     30                                        <a href="www.google.com" class="footer-icon"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/twitter-icon.png" alt="Twitter" class="png_img"/></a> 
     31                                        <a href="www.google.com" class="footer-icon"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/linkedin-icon.png" alt="LinkedIn" class="png_img"/></a> 
     32                                        <a href="www.google.com" class="footer-icon"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/delicious-icon.png" alt="Delicious" class="png_img"/></a> 
     33                                        <a href="www.google.com" class="footer-icon"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/digg-icon.png" alt="Digg" class="png_img"/></a> 
     34                                        <a href="www.google.com" class="footer-icon"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/stumbleupon-icon.png" alt="StumbleUpon" class="png_img"/></a> 
     35                                        <a href="www.google.com" class="footer-icon"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/rss-icon.png" alt="Rss" class="png_img"/></a> 
     36                                        <br clear="all" /> 
    3637                                </div> 
    3738                        </td> 

  • trunk/common/skins/mike2/header.php

    r1798 r1847  
    8080</div> 
    8181<!-- Start wrapper --> 
    82 <div class="wrapper"> 
     82<?php 
     83        if($appStyleDisplay0 == 'li-active' && !GetLoggedInStateFromWikiCookies()) 
     84                echo '<div class="wrapper_public">'; 
     85        else 
     86                echo '<div class="wrapper">'; 
     87?> 
    8388        <div class="header-wrapper">         
    8489                <a href="<?php echo RR_OMCOLLAB_DIRECTORY; ?>"><img id="logoimg" src="<?php echo RR_OMCOLLAB_DIRECTORY; ?>common/skins/mike2/images/logo.png" alt="<?php echo OMCOLLAB_APPLICATION_NAME; ?>" class="png_img"/></a> 
    8590        </div> 
    8691 
    87         <!-- Menu Area --> 
    88     <div class="menubar-left"></div> 
    89         <div class="menubar-middle"> 
    90             <ul class="menu-ul"> 
    91                     <li class="<?php echo $appStyleDisplay0 ?>"><a href="<?php echo $omCollabAppURLs[HOME]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Home</span></div></div></a></li> 
    92             <li class="<?php echo $appStyleDisplay1 ?>"><a href="<?php echo $omCollabAppURLs[PROFILE]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Profile</span></div></div></a></li> 
    93                     <li class="<?php echo $appStyleDisplay2 ?>" style="position: relative; z-index: 10000;"> 
    94                 <div class="wikisubmenu"> 
    95                                 <ul> 
    96                                         <?php  
    97                         $i=0; 
    98                                         global $omcollab_languages, $omcollab_languages_ignore_array; 
    99                                         foreach ((array)$omcollab_languages as $key=>$value) { 
    100                             $borderCSS = $i==0?"border: 0px;":""; 
    101                                                 if (!in_array($key,$omcollab_languages_ignore_array)) { 
    102                                                             if ($key != 'en') 
    103                                                                         echo '<li style="' . $borderCSS . '"><a href="' . $omCollabAppURLs[WIKI] . $key . '/"><div>' . $value . '</div></a></li>'; 
    104                                                                 else 
    105                                                                         echo '<li style="' . $borderCSS . '"><a href="' . $omCollabAppURLs[WIKI] . '"><div>' . $value . '</div></a></li>'; 
    106                                                         } 
    107                                 $i++; 
    108                                                 } 
    109                                         ?> 
    110                                 </ul> 
    111                     <div class="wikisubmenu-bottom"></div> 
    112                 </div> 
    113                             <a href="<?php echo $omCollabAppURLs[WIKI]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span id="wiki">Wiki</span></div></div></a> 
    114                     </li> 
    115                     <li class="<?php echo $appStyleDisplay3 ?>"><a href="<?php echo $omCollabAppURLs[BLOGS]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Blogs</span></div></div></a></li> 
    116             <li class="<?php echo $appStyleDisplay4 ?>"><a href="<?php echo $omCollabAppURLs[FORUM]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Discussion</span></div></div></a></li> 
    117             <li class="<?php echo $appStyleDisplay5 ?>"><a href="<?php echo $omCollabAppURLs[COMMUNITY]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Community</span></div></div></a></li> 
    118                     <li class="<?php echo $appStyleDisplay6 ?>"><a href="<?php echo $omCollabAppURLs[BOOKMARKS]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Bookmarks</span></div></div></a></li> 
    119             </ul> 
    120         <div id="google-search"> 
    121             <form action="<?php echo RR_OMCOLLAB_DIRECTORY; ?>explore/index.php/search" id="searchbox_<?php echo OMCOLLAB_GOOGLE_CSE_CODE; ?>" style="margin-bottom: 0px;"> 
    122             <input type="hidden" name="cx" value="<?php echo OMCOLLAB_GOOGLE_CSE_CODE; ?>" /> 
    123             <input type="hidden" name="cof" value="FORID:<?php echo OMCOLLAB_GOOGLE_CSE_FORID; ?>" /> 
    124             <input id="google-search-submit" type="submit" name="sa" value="Search" style="float: right;"/> 
    125             <input id="google-search-input" type="text" name="q" style="background: url(<?php echo RR_OMCOLLAB_DIRECTORY; ?>common/skins/mike2/images/searchbox.png) no-repeat; float: right; padding-left: 25px;" value="Search <?php echo OMCOLLAB_SITE_NAME;?> ..." onfocus="onTextboxFocus(this,'Search <?php echo OMCOLLAB_SITE_NAME;?> ...')" onblur="onTextboxBlur(this,'Search <?php echo OMCOLLAB_SITE_NAME;?> ...')"/> 
    126             </form> 
    127         </div> 
    128         <div class="clear"></div> 
    129         </div> 
    130     <div class="menubar-right"></div> 
    131         <div class="clear"></div> 
    132  
     92        <!-- Menu Area -->                                           
     93    <table cellpadding="0" cellspacing="0" border="0" width="100%"><tr> 
     94        <td class="menubar-left"></td> 
     95        <td class="menubar-middle"> 
     96            <ul class="menu-ul"> 
     97                <li class="<?php echo $appStyleDisplay0 ?>"><a href="<?php echo $omCollabAppURLs[HOME]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Home</span></div></div></a></li> 
     98                <li class="<?php echo $appStyleDisplay1 ?>"><a href="<?php echo $omCollabAppURLs[PROFILE]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Profile</span></div></div></a></li> 
     99                <li class="<?php echo $appStyleDisplay2 ?>" style="position: relative; z-index: 10000;"> 
     100                    <div class="wikisubmenu"> 
     101                        <ul> 
     102                            <?php  
     103                            $i=0; 
     104                            global $omcollab_languages, $omcollab_languages_ignore_array; 
     105                            foreach ((array)$omcollab_languages as $key=>$value) { 
     106                                $borderCSS = $i==0?"border: 0px;":""; 
     107                                if (!in_array($key,$omcollab_languages_ignore_array)) { 
     108                                    if ($key != 'en') 
     109                                            echo '<li style="' . $borderCSS . '"><a href="' . $omCollabAppURLs[WIKI] . $key . '/"><div>' . $value . '</div></a></li>'; 
     110                                        else 
     111                                            echo '<li style="' . $borderCSS . '"><a href="' . $omCollabAppURLs[WIKI] . '"><div>' . $value . '</div></a></li>'; 
     112                                    } 
     113                                    $i++; 
     114                                } 
     115                            ?> 
     116                        </ul> 
     117                        <div class="wikisubmenu-bottom"></div> 
     118                    </div> 
     119                    <a href="<?php echo $omCollabAppURLs[WIKI]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span id="wiki">Wiki</span></div></div></a> 
     120                </li> 
     121                <li class="<?php echo $appStyleDisplay3 ?>"><a href="<?php echo $omCollabAppURLs[BLOGS]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Blogs</span></div></div></a></li> 
     122                <li class="<?php echo $appStyleDisplay4 ?>"><a href="<?php echo $omCollabAppURLs[FORUM]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Discussion</span></div></div></a></li> 
     123                <li class="<?php echo $appStyleDisplay5 ?>"><a href="<?php echo $omCollabAppURLs[COMMUNITY]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Community</span></div></div></a></li> 
     124                <li class="<?php echo $appStyleDisplay6 ?>"><a href="<?php echo $omCollabAppURLs[BOOKMARKS]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Bookmarks</span></div></div></a></li> 
     125            </ul> 
     126            <div id="google-search"> 
     127                <form action="<?php echo RR_OMCOLLAB_DIRECTORY; ?>explore/index.php/search" id="searchbox_<?php echo OMCOLLAB_GOOGLE_CSE_CODE; ?>" style="margin-bottom: 0px;"> 
     128                <input type="hidden" name="cx" value="<?php echo OMCOLLAB_GOOGLE_CSE_CODE; ?>" /> 
     129                <input type="hidden" name="cof" value="FORID:<?php echo OMCOLLAB_GOOGLE_CSE_FORID; ?>" /> 
     130                <input id="google-search-submit" type="submit" name="sa" value="Search" style="float: right;"/> 
     131                <input id="google-search-input" type="text" name="q" style="background: url(<?php echo RR_OMCOLLAB_DIRECTORY; ?>common/skins/mike2/images/searchbox.png) no-repeat; float: right; padding-left: 25px;" value="Search <?php echo OMCOLLAB_SITE_NAME;?> ..." onfocus="onTextboxFocus(this,'Search <?php echo OMCOLLAB_SITE_NAME;?> ...')" onblur="onTextboxBlur(this,'Search <?php echo OMCOLLAB_SITE_NAME;?> ...')"/> 
     132                </form> 
     133            </div> 
     134            <div class="clear"></div> 
     135        </td> 
     136        <td class="menubar-right"></td> 
     137    </tr></table> 
    133138        <!-- Menu Area End --> 

  • trunk/common/skins/mike2/wikiheader.php

    r1778 r1847  
    8989                </div> 
    9090<!-- Start wrapper --> 
    91 <div class="wrapper"> 
     91<?php 
     92        if($appStyleDisplay0 == 'li-active' && !GetLoggedInStateFromWikiCookies()) 
     93                echo '<div class="wrapper_public">'; 
     94        else 
     95                echo '<div class="wrapper">'; 
     96?> 
    9297        <div class="header-wrapper">         
    9398                <a href="<?php echo RR_OMCOLLAB_DIRECTORY; ?>"><img id="logoimg" src="<?php echo RR_OMCOLLAB_DIRECTORY; ?>common/skins/mike2/images/logo.png" alt="<?php echo OMCOLLAB_APPLICATION_NAME; ?>" class="png_img"/></a> 
    … …  
    95100 
    96101<!-- Menu Area --> 
    97     <div class="menubar-left"></div> 
    98         <div class="menubar-middle"> 
     102<table cellpadding="0" cellspacing="0" border="0" width="100%"><tr> 
     103    <td class="menubar-left"></td> 
     104        <td class="menubar-middle"> 
    99105<ul class="menu-ul"> 
    100106                    <li class="<?php echo $appStyleDisplay0 ?>"><a href="<?php echo $omCollabAppURLs[HOME]     ?>"><div class="menubutton-left"><div class="menubutton-right"><span>Home</span></div></div></a></li> 
    … …  
    136142</div> 
    137143        <div class="clear"></div> 
    138         </div> 
    139     <div class="menubar-right"></div> 
    140         <div class="clear"></div> 
    141  
     144        </td> 
     145    <td class="menubar-right"></td> 
     146</tr></table> 
    142147<!-- Menu Area End --> 

  • trunk/explore/includes/templates/ExploreMainWrapper.html

    r1667 r1847  
    2323        }); 
    2424</script> 
    25 <div class="main-bg-top"></div> 
    26 <div class="main-wrapper"> 
     25<div class="main-bg-top"><div></div></div> 
     26<div class="main-wrapper"><div class="innerwrapper"> 
    2727        <table cellpadding="0" cellspacing="0" width="100%"><tr> 
    2828            <td id="column-one"> 
    … …  
    5151                </td> 
    5252    </tr></table> 
    53 </div> 
    54 <div class="main-bg-bottom"><div class="main-corner-bg"></div></div> 
     53</div></div> 
     54<div class="main-bg-bottom"><div class="innerbottomwrapper"></div><div class="main-corner-bg"></div></div> 
    5555{omCollabCommonFooter} 
    5656{GoogleAnalyticsJs} 

  • trunk/forum/styles/mike2/template/overall_footer.html

    r1667 r1847  
    4343        </tr> 
    4444</table> 
    45 </div> 
    46 <div class="main-bg-bottom"><div class="main-corner-bg"></div></div> 
     45</div></div> 
     46<div class="main-bg-bottom"><div class="innerbottomwrapper"></div><div class="main-corner-bg"></div></div> 
    4747<!-- PHP --> 
    4848$myskin = $_COOKIE[OMWIKI_DATABASE_NAME.'_'.OMWIKI_DB_TABLE_PREFIX.'myskin']; 

  • trunk/forum/styles/mike2/template/overall_header.html

    r1667 r1847  
    112112        include( $_SERVER['DOCUMENT_ROOT'] . $document_root . '/common/skins/' . $myskin . '/header.php' ); 
    113113<!-- ENDPHP --> 
    114 <div class="main-bg-top"></div> 
    115 <div class="main-wrapper"> 
     114<div class="main-bg-top"><div></div></div> 
     115<div class="main-wrapper"><div class="innerwrapper"> 
    116116        <table cellpadding="0" cellspacing="0" width="100%"><tr> 
    117117                <td id="column-one"> 

  • trunk/home

  • trunk/home/mylinks.php

  • trunk/home/portlets/PortletsClass.php

    r1820 r1847  
    456456            $html .= '<li><div class="skill-description">' . $askill['s_description'] . '</div>';  
    457457            $html .= '<div class="skill-number">' . $askill['s_count'] . '</div>'; 
    458             $html .= '<div class="clear"></div></li>'; 
     458            $html .= '<br class="clear" /></li>'; 
    459459        } 
    460460        $html .= '</ul><div class="button"><a href="/wiki/Special:UpdateProfile?section=community_expertise"><img src="' . RR_OMCOLLAB_DIRECTORY . 'common/skins/mike2/images/skill-find-more-button.png" /></a></div>'; 

  • trunk/home_loggedin.php

    r1820 r1847  
    110110    <script type="text/javascript" src="<?php echo RR_OMCOLLAB_DIRECTORY; ?>home/js/jquery.portal.js?<?php echo OMCOLLAB_VERSION;?>"></script> 
    111111<!-- Start Main Content --> 
    112 <div class="main-bg-top"></div> 
    113 <div class="main-wrapper"> 
    114     <table cellpadding="0" cellspacing="0" id="main"> 
     112<div class="main-bg-top"><div></div></div> 
     113<div class="main-wrapper"><div class="innerwrapper"> 
     114    <table cellpadding="0" cellspacing="0" id="main" width="100%"> 
    115115        <tr> 
    116116        <!-- Colmun one --> 
    … …  
    130130                    <li class="tab-seperator"><a href="/blogs/wp-admin" class="writeblog home-size">&nbsp;</a></li> 
    131131                    <li class="tab-seperator"><a href="/forum" class="writeforum home-size">&nbsp;</a></li> 
    132                     <li><a href="/wiki/Special:Upload" class="uploadfile home-size">&nbsp;</a></li> 
     132                    <li class="tab-seperator"><a href="/wiki/Special:Upload" class="uploadfile home-size">&nbsp;</a></li> 
    133133                </ul> 
    134134                <!-- End 4 main tabs in middle area --> 
    135                 <div id="c2" style="width: 557px;"></div> 
     135                <div id="c2"></div> 
    136136            </td> 
    137137        <!-- Colmun Three --> 
    … …  
    142142        </tr> 
    143143    </table> 
    144 </div> 
    145 <div class="main-bg-bottom"><div class="main-corner-bg"></div></div> 
     144</div></div> 
     145<div class="main-bg-bottom"><div class="innerbottomwrapper"></div><div class="main-corner-bg"></div></div> 
    146146<!-- End Main Content --> 
    147147 

  • trunk/install.php

    r1778 r1847  
    264264        $_POST['omwiki_article_path'] = "{$omcollab_installation_dir}w/$1"; 
    265265        }else{ 
    266             $_POST['omwiki_script_path']  = "{$omcollab_installation_dir}wiki"; 
     266            $_POST['omwiki_script_path']  = "{$omcollab_installation_dir}w"; 
    267267        $_POST['omwiki_article_path'] = "{$omcollab_installation_dir}w/index.php/$1"; 
    268268        } 
    … …  
    396396Use short URLs in MediaWiki? 
    397397<?php  if( stripos( $_SERVER['SERVER_SOFTWARE'], 'apache' ) !== false ): ?> 
    398 <input name="omwiki_use_short_urls" type="checkbox"> ( read <a href="readme.txt" target="_blank">this</a> and <a href='http://www.mediawiki.org/wiki/Manual:Short_URL' target='_blank'>this</a> first! ) 
     398<input name="omwiki_use_short_urls" type="checkbox" checked> ( read <a href="readme.txt" target="_blank">this</a> and <a href='http://www.mediawiki.org/wiki/Manual:Short_URL' target='_blank'>this</a> first! ) 
    399399<?php endif; ?> 
    400400 

  • trunk/w

  • trunk/w/LocalSettings.php

    r1833 r1847  
    369369// xiping.wang@gmail.com 2010-03-09 
    370370// Add Login Language Selector 
    371 $wgLoginLanguageSelector=true; 
     371// $wgLoginLanguageSelector=true; 
    372372 
    373373// Make sure these settings right 
    … …  
    407407$wgDisableLangConversion=true; 
    408408$wgShowExceptionDetails = true; 
     409 

  • trunk/w/extensions/SocialProfile/UserProfile/SpecialUpdateProfile.php

    r1820 r1847  
    598598                $form .= '<li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=career" class="wiki-career home-size">&nbsp;</a></li>'; 
    599599                $form .= '<li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=community_expertise" class="wiki-communityexpertise home-size">&nbsp;</a></li>'; 
    600                 $form .= '<li><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=preferences" class="wiki-preferences home-size">&nbsp;</a></li>'; 
     600                $form .= '<li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=preferences" class="wiki-preferences home-size">&nbsp;</a></li>'; 
    601601                $form .= "</ul>"; 
    602602                $form .= "<div class=\"profile-content-bg-top\"></div>"; 
    … …  
    861861                                <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=preferences" class="wiki-preferences home-size">&nbsp;</a></li>        
    862862                                <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=community_expertise" class="wiki-communityexpertise home-size">&nbsp;</a></li> 
    863                                 <li><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile" class="wiki-personalinfo home-size">&nbsp;</a></li> 
     863                                <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile" class="wiki-personalinfo home-size">&nbsp;</a></li> 
    864864                        </ul> 
    865865                        <div class="profile-content-bg-top"></div> 
    … …  
    987987                                <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=community_expertise" class="wiki-communityexpertise home-size">&nbsp;</a></li> 
    988988                                <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=expertise" class="wiki-expertise home-size">&nbsp;</a></li> 
    989                                 <li><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile" class="wiki-personalinfo home-size">&nbsp;</a></li> 
     989                                <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile" class="wiki-personalinfo home-size">&nbsp;</a></li> 
    990990                        </ul> 
    991991                        <div class="profile-content-bg-top"></div> 
    … …  
    10401040                        <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=community_expertise" class="wiki-communityexpertise home-size">&nbsp;</a></li> 
    10411041                                <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=expertise" class="wiki-expertise home-size">&nbsp;</a></li> 
    1042                                 <li><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile" class="wiki-personalinfo home-size">&nbsp;</a></li> 
     1042                                <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile" class="wiki-personalinfo home-size">&nbsp;</a></li> 
    10431043                        </ul> 
    10441044                        <div class="profile-content-bg-top"></div> 
    … …  
    14791479                                <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=expertise" class="wiki-expertise home-size">&nbsp;</a></li> 
    14801480                                <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile?section=career" class="wiki-career home-size">&nbsp;</a></li> 
    1481                                 <li><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile" class="wiki-personalinfo home-size">&nbsp;</a></li> 
     1481                                <li class="tab-seperator"><a href="'.OMWIKI_SCRIPT_PATH.'/index.php/Special:UpdateProfile" class="wiki-personalinfo home-size">&nbsp;</a></li> 
    14821482                        </ul><div>'; 
    14831483                $form .= '<form action="" method=post enctype="multipart/form-data" name=profile>'; 

  • trunk/w/extensions/SocialProfile/UserProfile/UserProfile.css

    r1778 r1847  
    600600.profile-update-unit { 
    601601        float:left; 
    602         width:450px; 
     602        /*width:450px; */ 
    603603} 
    604604 
    … …  
    651651} 
    652652 
    653 textarea { 
    654         width: 90%; 
    655         height: 5em; 
    656         } 
    657          
    658653/* profile completeness */ 
    659654 

  • trunk/w/extensions/SocialProfile/UserProfile/jquery/MIKE2_jquery.tabs.css

    r1820 r1847  
    5959} 
    6060.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active { 
    61     background-position: 100% -100px; 
     61    /*background-position: 100% -100px;*/ 
    6262} 
    6363.tabs-nav a span { 
    … …  
    7777} 
    7878.tabs-nav .tabs-selected a span, .tabs-nav a:hover span, .tabs-nav a:focus span, .tabs-nav a:active span { 
    79     background-position: 1px -50px; 
     79    background-position: 0px -50px; 
    8080} 
    8181.tabs-nav a span, .tabs-nav .tabs-disabled a:hover span, .tabs-nav .tabs-disabled a:focus span, .tabs-nav .tabs-disabled a:active span { 
    … …  
    9292} 
    9393.tabs-container { 
    94     border-top: 0px solid #97a5b0; 
     94    border: 1px solid #dddddd; 
    9595    padding: 1em 8px; 
    96     background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */ 
     96    background-color: #fafafa; /* declare background color for container to avoid distorted fonts in IE while fading */ 
    9797} 
    9898.tabs-loading em { 

  • trunk/w/includes/templates/Userlogin.php

    r1820 r1847  
    196196                        </td> 
    197197                </tr> 
     198                <!-- 
    198199                <tr> 
    199200                        <?php if( $this->data['useemail'] ) { ?> 
    … …  
    208209                                </td> 
    209210                        <?php } ?> 
    210                         <?php if( $this->data['userealname'] ) { ?> 
    211                                 </tr> 
    212                                 <tr> 
    213                                         <td class="signup-labelfield"><label for='wpRealName'><?php $this->msg('yourrealname') ?></label></td> 
    214                                         <td class="signup-inputfield"> 
    215                                                 <input type='text' class='signup-input' name="wpRealName" id="wpRealName" 
    216                                                         tabindex="6" 
    217                                                         value="<?php $this->text('realname') ?>" /> 
    218                                                  
    219                                         </td> 
    220                         <?php } ?> 
    221                 </tr> 
     211                </tr> 
     212                --> 
    222213                <!-- xiping.wang at gmail.com - 2010-8-19 - User ReCaptcha's custom theme --> 
    223214                <?php  
    … …  
    226217                ?> 
    227218                <tr> 
    228                         <td colspan=2><div style='margin-left:-25px;' id='recaptcha_image'></div> 
    229                         </td> 
    230                 </tr> 
    231                 <tr> 
    232                         <td class="signup-labelfield">Type the two words above:</td> 
     219                        <td class="signup-labelfield">Type the two words below:</td> 
    233220                        <td class="signup-inputfield"><input type='text' class='signup-input' name='recaptcha_response_field' id='recaptcha_response_field' 
    234221                                tabindex='7'/> 
     222                        </td> 
     223                </tr> 
     224                <tr> 
     225                        <td colspan=2><div style='margin-left:-25px;' id='recaptcha_image'></div> 
    235226                        </td> 
    236227                </tr> 

  • trunk/w/skins/Mike2.php

    r1827 r1847  
    9191                include( FS_COMMON_DIRECTORY . "/skins/mike2/" . $wikiflag . "header.php"); ?> 
    9292<!-- Start main content --> 
    93 <div class="main-bg-top"></div> 
    94 <div class="main-wrapper"> 
     93<div class="main-bg-top"><div></div></div> 
     94<div class="main-wrapper"><div class="innerwrapper"> 
    9595        <table cellpadding="0" cellspacing="0" width="100%"><tr> 
    9696            <td id="column-one"> 
    … …  
    416416</script> 
    417417<?php endif; ?> 
    418 </div> 
    419 <div class="main-bg-bottom"><div class="main-corner-bg"></div></div> 
     418</div></div> 
     419<div class="main-bg-bottom"><div class="innerbottomwrapper"></div><div class="main-corner-bg"></div></div> 
    420420<!-- End main content --> 
    421421<?php include( FS_COMMON_DIRECTORY . "/skins/mike2/footer.php"); ?> 

  • trunk/w/skins/Mike2.php.bak

    r1778 r1847  
    9292                include( FS_COMMON_DIRECTORY . "/skins/mike2/" . $wikiflag . "header.php"); ?> 
    9393<!-- Start main content --> 
    94 <div class="main-bg-top"></div> 
    95 <div class="main-wrapper"> 
     94<div class="main-bg-top"><div></div></div> 
     95<div class="main-wrapper"><div class="innerwrapper"> 
    9696        <table cellpadding="0" cellspacing="0" width="100%"><tr> 
    9797            <td id="column-one"> 
    … …  
    610610</script> 
    611611<?php endif; ?> 
    612 </div> 
    613 <div class="main-bg-bottom"><div class="main-corner-bg"></div></div> 
     612</div></div> 
     613<div class="main-bg-bottom"><div class="innerbottomwrapper"></div><div class="main-corner-bg"></div></div> 
    614614<!-- End main content --> 
    615615<?php include( FS_COMMON_DIRECTORY . "/skins/mike2/footer.php"); ?> 
Note: See TracChangeset for help on using the changeset viewer.