Changeset 7489
- Timestamp:
- 05/01/09 12:13:07 (16 months ago)
- Location:
- branches/1.8
- Files:
-
- 22 modified
-
. (modified) (1 prop)
-
interface/common (modified) (1 prop)
-
interface/common/blog (modified) (1 prop)
-
library/view/view.php (modified) (1 diff)
-
plugins (modified) (1 prop)
-
plugins/GoogleMap (modified) (1 prop)
-
plugins/GoogleMap/insert.css (modified) (1 prop)
-
plugins/GoogleMap/scripts/common.js (modified) (1 prop)
-
plugins/GoogleMap/scripts/editor.js (modified) (1 prop)
-
plugins/GoogleMap/scripts/insert.js (modified) (1 prop)
-
plugins/GoogleMap/scripts/jquery-1.2.6.min.js (modified) (1 prop)
-
plugins/GoogleMap/scripts/jquery-mousewheel.min.js (modified) (1 prop)
-
plugins/GoogleMap/scripts/jquery-ui-1.6rc2.js (modified) (1 prop)
-
resources/script (modified) (1 prop)
-
resources/script/common2.js (modified) (1 prop)
-
resources/script/jquery/jquery.easing.1.3.js (modified) (1 prop)
-
resources/script/jquery/jquery.json.js (modified) (1 prop)
-
resources/script/jquery/jquery.textcube.js (modified) (1 prop)
-
resources/script/jquery/jquery.ui.effects.1.6.js (modified) (1 prop)
-
skin/admin (modified) (1 prop)
-
skin/admin/whitedream (modified) (1 prop)
-
skin/blog (modified) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
branches/1.8
-
branches/1.8/interface/common
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/interface/common/blog
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/library/view/view.php
r7370 r7489 1051 1051 1052 1052 function addWebSlice($content, $id, $title) { 1053 return '<div class="hslice" id="'.$id.'" >'.CRLF.1053 return '<div class="hslice" id="'.$id.'" style="margin:0;padding:0;">'.CRLF. 1054 1054 '<h4 class="entry-title" style="visibility:hidden;height:0;margin:0;padding:0;">'.$title.'</h4>'.CRLF. 1055 '<div class="entry-content" >'.CRLF.$content.CRLF.'</div>'.CRLF.1055 '<div class="entry-content" style="margin:0;padding:0;">'.CRLF.$content.CRLF.'</div>'.CRLF. 1056 1056 '</div>'.CRLF; 1057 1057 } -
branches/1.8/plugins
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/plugins/GoogleMap
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/plugins/GoogleMap/insert.css
- Property svn:mergeinfo changed
/trunk/plugins/GoogleMap/insert.css (added) merged: 7487
- Property svn:mergeinfo changed
-
branches/1.8/plugins/GoogleMap/scripts/common.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/plugins/GoogleMap/scripts/editor.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/plugins/GoogleMap/scripts/insert.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/plugins/GoogleMap/scripts/jquery-1.2.6.min.js
- Property svn:mergeinfo changed
/trunk/plugins/GoogleMap/scripts/jquery-1.2.6.min.js (added) merged: 7487
- Property svn:mergeinfo changed
-
branches/1.8/plugins/GoogleMap/scripts/jquery-mousewheel.min.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/plugins/GoogleMap/scripts/jquery-ui-1.6rc2.js
- Property svn:mergeinfo changed
/trunk/plugins/GoogleMap/scripts/jquery-ui-1.6rc2.js (added) merged: 7487
- Property svn:mergeinfo changed
-
branches/1.8/resources/script
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/resources/script/common2.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/resources/script/jquery/jquery.easing.1.3.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/resources/script/jquery/jquery.json.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/resources/script/jquery/jquery.textcube.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/resources/script/jquery/jquery.ui.effects.1.6.js
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/skin/admin
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/skin/admin/whitedream
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/1.8/skin/blog
- Property svn:mergeinfo changed (with no actual effect on merging)
