Changeset 1798 for trunk


Ignore:
Timestamp:
08/17/2010 12:21:25 PM (21 months ago)
Author:
Xiping.Wang
Message:

[trunk]merged from trunk

Location:
trunk
Files:
4 deleted
15 edited
5 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/_InstallationResources

  • trunk/_InstallationResources/additional_deployment_scripts/my_additional_build_processes.php

    r492 r1798  
    8585# 9. change the namespaces in the wiki footer to point to MIKE2: 
    8686$filecontents = file_get_contents( '/home/openmeth/openmethodology.org/html/mike2/common/skins/mike2/footer.php' ); 
    87 $filecontents = str_replace( 'index.php/omCollab:', 'index.php/MIKE2:', $filecontents ); 
     87$filecontents = str_replace( 'omCollab:', 'MIKE2:', $filecontents ); 
    8888file_put_contents( '/home/openmeth/openmethodology.org/html/mike2/common/skins/mike2/footer.php', $filecontents ); 
    8989 

  • trunk/blogs

    • Property svn:mergeinfo changed (with no actual effect on merging)

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

    • Property svn:mergeinfo changed (with no actual effect on merging)

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

    r1784 r1798  
    9292.banner-wrapper .button-wrapper .active {float: left; padding: 0px 19px 0px 20px; line-height: 40px; font-size: 12px; color: #131313; font-weight: bold; background-color: #FFFFFF; border-right: 1px solid #FFFFFF;} 
    9393.banner-wrapper .button-wrapper .over {float: left; padding: 0px 19px 0px 20px; margin-top: 10px; line-height: 30px; font-size: 12px; color: #FFFFFF; font-weight: bold; background-color: #559abc; border-right: 1px solid #8ec1da; cursor: pointer;} 
    94 .banner-wrapper .banner-content {width: 590px; height: 273px; background: url(images/banner-BG.jpg) no-repeat; z-index: 100; position: absolute;} 
     94.banner-wrapper .banner-content {width: 590px; height: 273px; background: url(images/banner-BG.jpg) no-repeat; z-index: 100; position: absolute; font-family: Georgia; font-size: 14px; } 
     95.banner-wrapper .banner-content a {font-weight: bold;} 
     96.banner-wrapper .banner-content p {padding: 0px 7px;} 
    9597.banner-wrapper .banner-content table {margin: 14px 24px;} 
    9698.signup-wrapper {float: right; width: 360px; padding-right: 2px; padding-top: 7px;} 
    … …  
    360362.category-description {float: left; width: 123px; } 
    361363.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;} 
     364.post {width:550px;} 
    362365 
    363366/* Mediawiki tool icons */ 

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

    r1778 r1798  
    6969        <li><a href="<?php echo OMWIKI_SCRIPT_PATH ?>/index.php/Special:UpdateProfile?section=preferences"><span>Preferences</span></a></li> 
    7070        <?php } ?> 
    71         <li style="width: 60px; text-align: center;"><a href="<?php echo $omCollabAppURLs[WIKI] ?>Help:Formatting"><span>Help</span></a></li> 
     71        <li style="width: 60px; text-align: center;"><a href="<?php echo $omCollabAppURLs[WIKI] ?>Help:Contents"><span>Help</span></a></li> 
    7272        <?php 
    7373                if(GetLoggedInStateFromWikiCookies()){  

  • trunk/home

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • trunk/home/mylinks.php

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • trunk/home_public.php

    r1778 r1798  
    9090    <div class="banner-wrapper"> 
    9191        <div class="button-wrapper"> 
    92             <span id="am" class="active">About Mike 2.0</span> 
    93             <span id="gfwm" class="normal">Get Familiar with Mike</span> 
    94             <span id="sc" class="normal">Solution Capabilities</span> 
    95             <span id="faq" class="normal">FAQs</span> 
    96             <div id="more" class="morebutton noborder"><a href="/wiki">More</a></div> 
    97              
     92            <span id="am" class="active">About MIKE2.0</span> 
     93            <span id="gfwm" class="normal">Get Familiar with MIKE2.0</span> 
     94            <span id="sc" class="normal">Solutions</span> 
     95            <span id="faq" class="normal">FAQ</span> 
     96            <!-- <div id="more" class="morebutton noborder"><a href="/wiki">More</a></div> --> 
    9897            <div class="clear"></div> 
    9998        </div> 
    … …  
    101100            <div id="am-content" style="display: block;"> 
    102101                <table cellpadding="0" cellspacing="0" border="0"> 
    103                     <tr><td height="200" valign="top"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/am-content.png" /></td></tr> 
     102                    <tr><td height="200" valign="top"> 
     103                        <br /><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/banner-tab1-title.png" /> 
     104                        <p>MIKE2.0 which stands for Method for an Integrated Knowledge Environment, is an open source methodology for  Enterprise Information Management that provides a framework for information development . The MIKE2.0 Methodology is part of the overall Open Methodology Framework.</p> 
     105                    </td></tr> 
    104106                    <tr><td align="right"> 
    105107                        <a href="/wiki/What_is_MIKE2.0"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/find-out-more.png" /></a>&nbsp;&nbsp; 
    106                         <a href=""><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/take-video-tour.png" /></a> 
     108                        <!-- <a href=""><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/take-video-tour.png" /></a> --> 
    107109                    </td></tr> 
    108110                </table> 
    … …  
    110112            <div id="gfwm-content" style="display: none;"> 
    111113                <table cellpadding="0" cellspacing="0" border="0"> 
    112                     <tr><td height="200" valign="top"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/gfwm-content.png" /></td></tr> 
    113                     <tr><td align="right"> 
    114                         <a href="/wiki"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/find-out-more.png" /></a>&nbsp;&nbsp; 
    115                         <a href=""><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/take-video-tour.png" /></a> 
     114                    <tr><td height="200" valign="top"> 
     115                        <br /><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/banner-tab2-title.png" /> 
     116                        <p>The era of ubiquitous technology has lead to a new challenge - managing ubiquitous information. We now find that almost every organisation has a major challenge with managing their data.  <br />The MIKE2.0 Methodology has been built to support our belief that information really is one of the most crucial assets of a business.  As a starting point to understanding MIKE2.0. read this <a href="/wiki/Structural_Overview_of_MIKE2.0">overview</a>.</p> 
     117                    </td></tr> 
     118                    <tr><td align="right"> 
     119                        <a href="/wiki/Structural_Overview_of_MIKE2.0"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/find-out-more.png" /></a>&nbsp;&nbsp; 
     120                        <!-- <a href=""><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/take-video-tour.png" /></a> --> 
    116121                    </td></tr> 
    117122                </table>     
    … …  
    119124            <div id="sc-content" style="display: none;"> 
    120125                <table cellpadding="0" cellspacing="0" border="0"> 
    121                     <tr><td height="200" valign="top"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/sc-content.png" /></td></tr> 
    122                     <tr><td align="right"> 
    123                         <a href="/wiki/MIKE2:Solution_Capabilities"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/find-out-more.png" /></a>&nbsp;&nbsp; 
    124                         <a href=""><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/take-video-tour.png" /></a> 
     126                    <tr><td height="200" valign="top"> 
     127                        <br /><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/banner-tab3-title.png" /> 
     128                        <p>MIKE2.0 covers the complete information supply chain within an organisation: from how it is created, accessed, presented and used in decision-making to how it is kept secure, stored and destroyed.  <br />It covers areas such as Information Governance, Data Warehousing, Master Data Management, Information Lifecycle Management and Enterprise 2.0.  Read more about the <a href="/wiki/MIKE2:Solution_Offerings">different types of solutions in MIKE2.0</a> as well as how they are mapped into the overall methodology through <a href="/wiki/Usage_Model">usage models</a>.</p> 
     129                    </td></tr> 
     130                    <tr><td align="right"> 
     131                        <a href="/wiki/MIKE2:Solution_Offerings"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/find-out-more.png" /></a>&nbsp;&nbsp; 
     132                        <!-- <a href=""><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/take-video-tour.png" /></a> --> 
    125133                    </td></tr> 
    126134                </table>     
    … …  
    128136            <div id="faq-content" style="display: none;"> 
    129137                <table cellpadding="0" cellspacing="0" border="0"> 
    130                     <tr><td height="200" valign="top"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/faq-content.png" /></td></tr> 
    131                     <tr><td align="right"> 
    132                         <a href="/wiki"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/find-out-more.png" /></a>&nbsp;&nbsp; 
    133                         <a href=""><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/take-video-tour.png" /></a> 
     138                    <tr><td height="200" valign="top"> 
     139                        <br /><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/banner-tab4-title.png" /> 
     140                        <p>We have compiled a list of <a href="/wiki/MIKE2:FAQs">Frequently Asked Question</a>s related to the MIKE2.0 Methodology. Feel to add your questions to <a href="/wiki/?title=Talk:FAQs&action=edit">this article's talk page</a> or within the <a href="/forum/">group discussions</a> area.  <br />You'll find a number of active users on the site that can help answer your questions about the approach and how it can be applied to provide a transformational approach to information management.</p> 
     141                    </td></tr> 
     142                    <tr><td align="right"> 
     143                        <a href="/wiki/MIKE2:FAQs"><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/find-out-more.png" /></a>&nbsp;&nbsp; 
     144                        <!-- <a href=""><img src="<?php echo RR_COMMON_SKIN_DIRECTORY ?>/images/take-video-tour.png" /></a> --> 
    134145                    </td></tr> 
    135146                </table>     
    … …  
    144155        <div class="middle"> 
    145156            <div class="blockTitle" style="margin-left: 20px;"> 
    146                 Join mike 2.0 today 
     157                Join MIKE2.0 today 
    147158            </div> 
    148159            <div style="margin-left: 20px;" id="signup_form"> 

  • trunk/w

  • trunk/w/LocalSettings.php

    r1778 r1798  
    322322 */ 
    323323//$wgDefaultUserOptions['riched_start_disabled']=false; 
     324$wgDefaultUserOptions['cols']=65; // Added by zhongzhen to decrease textarea box width in wiki Edit page on 2010-08-16. 
    324325 
    325326 

  • trunk/w/extensions/omCollabSingleSignon.php

    r1778 r1798  
    215215        setcookie( $sPassCookie, md5( md5( $_POST['wpPassword'] ) ), time() + 31536000, RR_OMCOLLAB_DIRECTORY . 'blogs/' ); 
    216216     
    217         setcookie( 'omCollabExplore', $wgUser->getName(), time() + 31536000, RR_OMCOLLAB_DIRECTORY . '/' ); 
     217         
     218        setcookie( 'omCollabExplore', $wgUser->getName(), time() + 31536000, RR_OMCOLLAB_DIRECTORY); 
    218219        setcookie( 'omCollabExplore', $wgUser->getName(), time() + 31536000, RR_OMCOLLAB_DIRECTORY . 'home/' ); 
    219220        setcookie( 'omCollabExplore', $wgUser->getName(), time() + 31536000, RR_OMCOLLAB_DIRECTORY . 'wiki/' ); 
    … …  
    298299 
    299300        // omExplore                                                                         
    300         setcookie( 'omCollabExplore', false, time() + 31536000, RR_OMCOLLAB_DIRECTORY . '/' ); 
     301        setcookie( 'omCollabExplore', false, time() + 31536000, RR_OMCOLLAB_DIRECTORY ); 
    301302        setcookie( 'omCollabExplore', false, time() + 31536000, RR_OMCOLLAB_DIRECTORY . 'home/' );             
    302303    setcookie( 'omCollabExplore', false, time() + 31536000, RR_OMCOLLAB_DIRECTORY . 'wiki/' ); 

  • trunk/w/includes/specials/SpecialDocConvert.php

    r1075 r1798  
    169169                                 
    170170                                $wgOut->addHTML("Your document was converted successfully.  Please press Preview below to preview and save the page.<br /><br />"); 
     171                                // Edited by zhongzhen on 2010-08-16. cols value was changed from 80 to 65 
    171172                                $wgOut->addHTML(" 
    172173                                        <form id='editform' name='editform' method='post' action='$title' enctype='multipart/form-data'> 
    173                                         <textarea tabindex='1' accesskey=',' name='wpTextbox1' id='wpTextbox1' rows='25' cols='80' >$mediaWikiTxtData</textarea> 
     174                                        <textarea tabindex='1' accesskey=',' name='wpTextbox1' id='wpTextbox1' rows='25' cols='65' >$mediaWikiTxtData</textarea> 
    174175                                        <input id='wpPreview' name='wpPreview' type='submit' tabindex='4' value='Show preview' accesskey='p' title='Preview your changes, please use this before saving! [p]' /> 
    175176                                        </form> 

  • trunk/w/skins/Mike2.php

    r1778 r1798  
    111111                        <?php 
    112112                        # Allow MediaWiki:Sidebar article to be wikitext 
    113                         /*global $wgUser,$wgTitle,$wgParser; 
     113                        global $wgUser,$wgTitle,$wgParser; 
    114114                        $side = new Article(Title::newFromText('Sidebar',NS_MEDIAWIKI)); 
    115115                        if (is_object($wgParser)) { $psr = $wgParser; $opt = $wgParser->mOptions; } 
    … …  
    117117                        if (!is_object($opt)) $opt = ParserOptions::newFromUser($wgUser); 
    118118                        $html = $psr->parse($side->fetchContent(),$wgTitle,$opt,true,true)->getText(); 
    119                         echo preg_replace("/<li>\\s*<\\/li>/",'',$html);*/ ?> 
     119                        echo preg_replace("/<li>\\s*<\\/li>/",'',$html); ?> 
    120120                        <!-- Submenu End --> 
    121121 
Note: See TracChangeset for help on using the changeset viewer.