Changeset 1385


Ignore:
Timestamp:
02/25/2010 09:36:45 AM (2 years ago)
Author:
Xiping.Wang
Message:

[omcollab_zhongzhen2] sync with trunk

Location:
branches/omcollab_zhongzhen2
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/omcollab_zhongzhen2

  • branches/omcollab_zhongzhen2/_InstallationResources

  • branches/omcollab_zhongzhen2/_InstallationResources/UserProfilePage.js

    r478 r1385  
    4141 
    4242function uploadError(message){ 
     43        if(jQuery) jQuery.noConflict(); 
    4344        $('mini-gallery-' + replaceID).innerHTML = oldHtml; 
    4445        $('upload-frame-errors').innerHTML = message; 
    … …  
    4950 
    5051function textError(message){ 
     52        if(jQuery) jQuery.noConflict(); 
    5153        $('upload-frame-errors').innerHTML = message; 
    5254        new YAHOO.widget.Effects.Show('upload-frame-errors'); 
    … …  
    5456 
    5557function completeImageUpload(){ 
     58        if(jQuery) jQuery.noConflict(); 
    5659        new YAHOO.widget.Effects.Hide('upload-frame-errors'); 
    5760        $('upload-frame-errors').innerHTML = ''; 
    … …  
    7174 
    7275function uploadComplete(imgSrc, imgName, imgDesc){ 
     76        if(jQuery) jQuery.noConflict(); 
    7377        replaceSrc = imgSrc; 
    7478 

  • branches/omcollab_zhongzhen2/_InstallationResources/UserRelationship.js

    r103 r1385  
    11        function requestResponse(response,id){ 
     2                if(jQuery) jQuery.noConflict(); 
    23                var url = "{omwiki_script_path}/index.php?action=ajax"; 
    34                var pars = 'rs=wfRelationshipRequestResponse&rsargs[]=' + response + '&rsargs[]=' + id 

  • branches/omcollab_zhongzhen2/_InstallationResources/omforum_migration_13100_13200.sql

    r1307 r1385  
    22-- Added by zhongzhen newely 
    33--  
     4update om_config 
     5   set config_value=1,is_dynamic=1 
     6 where config_name = 'load_tplcompile'; 
     7 
    48 
    59INSERT INTO `om_styles` VALUES (4,'mike2green','© omCollab, 2008',1,4,4,4); 

  • branches/omcollab_zhongzhen2/blogs

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

  • branches/omcollab_zhongzhen2/common/skins/mike2green/wikiheader.php

    r1321 r1385  
    4141<div class="header-wrapper"> 
    4242        <div class="left-wrapper"> 
    43                 <div id="omlogo" style="height: 53px; "><a href="<?php echo RR_OMCOLLAB_DIRECTORY; ?>"><img id="logoimg" src="<?php echo RR_OMCOLLAB_DIRECTORY; ?>common/skins/mike2/images/logo.gif" alt="<?php echo OMCOLLAB_APPLICATION_NAME; ?>"/></a></div> 
     43                <div id="omlogo" style="height: 53px; "><a href="<?php echo RR_OMCOLLAB_DIRECTORY; ?>"><img id="logoimg" src="<?php echo RR_OMCOLLAB_DIRECTORY; ?>common/skins/mike2green/images/logo.gif" alt="<?php echo OMCOLLAB_APPLICATION_NAME; ?>"/></a></div> 
    4444                <div id="tagline"><?php echo OMCOLLAB_FRONTPAGE_TAGLINE;?></div> 
    4545        </div> 

  • branches/omcollab_zhongzhen2/forum/styles/mike2/template/overall_header.html

    r1306 r1385  
    1616 
    1717<!-- 
    18         phpBB style name: prosilver 
     18        phpBB style name: mike2 
    1919        Based on style:   prosilver (this is the default phpBB3 style) 
    2020        Original author:  Tom Beddard ( http://www.subBlue.com/ ) 

  • branches/omcollab_zhongzhen2/forum/styles/mike2green/template/overall_header.html

    r1323 r1385  
    1616 
    1717<!-- 
    18         phpBB style name: prosilver 
     18        phpBB style name: mike2green 
    1919        Based on style:   prosilver (this is the default phpBB3 style) 
    2020        Original author:  Tom Beddard ( http://www.subBlue.com/ ) 

  • branches/omcollab_zhongzhen2/home/contribution/teamContributionStatistic.php

    r1373 r1385  
    143143                $FC->setChartParam("pieFillAlpha","70"); 
    144144                $FC->setChartParam("pieSliceDepth","15"); 
    145 //              $FC->setChartParam("pieRadius","100"); 
     145                $FC->setChartParam("pieRadius","100"); 
    146146                $FC->setChartParam("decimalPrecision","0"); 
    147147                $FC->setChartParam("canvasBorderColor","666666"); 

  • branches/omcollab_zhongzhen2/home/portlets/PortletsClass.php

    r1373 r1385  
    409409 
    410410                # Set chart attributes 
    411                 $FC->setChartParam("caption","Top 10 skills from MIKE2 community"); 
     411                $FC->setChartParam("caption","Top 10 skills from community"); 
    412412//              $FC->setChartParam("subCaption"," --"); 
    413413                $FC->setChartParam("showNames","1"); 

  • branches/omcollab_zhongzhen2/wiki

  • branches/omcollab_zhongzhen2/wiki/LocalSettings.php

    r1352 r1385  
    157157$wgEnableUploads     = true; 
    158158$wgUploadBaseUrl     = $wgServer; 
    159 $wgFileExtensions    = array( 'png', 'gif', 'jpg', 'jpeg', 'doc', 'pdf', 'xls', 'ppt', 'docx','xlsx','pptx','zip'); 
     159$wgFileExtensions    = array( 'png', 'gif', 'jpg', 'jpeg', 'doc', 'pdf', 'xls', 'ppt', 'docx','xlsx','pptx','zip','svg'); 
    160160 
    161161# [ extensions ] 
    … …  
    310310// Add top contributors per article 
    311311require_once("$IP/extensions/awc/top_ten/top_ten.php"); 
     312 
     313 
     314// xiping.wang@gmail.com 2010-02-24  
     315// Replace svg convert from ImageMagick to librsvg 
     316// $wgSVGConverter = 'rsvg'; 

  • branches/omcollab_zhongzhen2/wiki/extensions/SocialProfile/UserBoard/SpecialUserBoard.php

    r1086 r1385  
    116116                        var posted = 0; 
    117117                        function send_message(){ 
     118                                if(jQuery) jQuery.noConflict(); 
    118119                                if(\$(\"message\").value && !posted){ 
    119120                                        posted = 1; 
Note: See TracChangeset for help on using the changeset viewer.