|
From: <net...@us...> - 2012-12-26 08:38:14
|
Revision: 1250
http://openautomation.svn.sourceforge.net/openautomation/?rev=1250&view=rev
Author: netzkind
Date: 2012-12-26 08:38:07 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
widget 'iframe' is now 'web'; xsd is already up to speed.
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/Makefile
CometVisu/trunk/visu/designs/metal/basic.css
CometVisu/trunk/visu/index.html
Added Paths:
-----------
CometVisu/trunk/visu/structure/pure/web.js
Removed Paths:
-------------
CometVisu/trunk/visu/structure/pure/iframe.js
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2012-12-25 23:52:36 UTC (rev 1249)
+++ CometVisu/trunk/ChangeLog 2012-12-26 08:38:07 UTC (rev 1250)
@@ -71,6 +71,7 @@
- lots of little bugfixes and improvements
- Editor: old WYSIWYG-editor was removed due to existing and forseeable compatibility issues
<Changes up to Revision 1243 included>
+- iframe-widget was renamed to web
0.6.2
Modified: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile 2012-12-25 23:52:36 UTC (rev 1249)
+++ CometVisu/trunk/Makefile 2012-12-26 08:38:07 UTC (rev 1250)
@@ -14,7 +14,7 @@
${STRUCTURE_PURE}/_common.js\
${STRUCTURE_PURE}/break.js\
${STRUCTURE_PURE}/group.js\
- ${STRUCTURE_PURE}/iframe.js\
+ ${STRUCTURE_PURE}/web.js\
${STRUCTURE_PURE}/image.js\
${STRUCTURE_PURE}/imagetrigger.js\
${STRUCTURE_PURE}/include.js\
Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css 2012-12-25 23:52:36 UTC (rev 1249)
+++ CometVisu/trunk/visu/designs/metal/basic.css 2012-12-26 08:38:07 UTC (rev 1250)
@@ -111,7 +111,7 @@
background-image: -o-linear-gradient(#444444, #2d2d2d); /* Opera 11.10+ */
background-image: linear-gradient(#444444, #2d2d2d);
}
-.widget.iframe
+.widget.web
{
border: none;
background-image: none;
@@ -624,7 +624,7 @@
div#demo_3 {
background-color: #1d1d1d;
}
-.iframe .actor { width: 98%; }
+.web .actor { width: 98%; }
#navbarTop .navbar .widget_container, #navbarBottom .navbar .widget_container {
width: auto;
Modified: CometVisu/trunk/visu/index.html
===================================================================
--- CometVisu/trunk/visu/index.html 2012-12-25 23:52:36 UTC (rev 1249)
+++ CometVisu/trunk/visu/index.html 2012-12-26 08:38:07 UTC (rev 1250)
@@ -28,7 +28,7 @@
<script src="structure/pure/break.js" type="text/javascript"></script>
<script src="structure/pure/group.js" type="text/javascript"></script>
<script src="structure/pure/rgb.js" type="text/javascript"></script>
- <script src="structure/pure/iframe.js" type="text/javascript"></script>
+ <script src="structure/pure/web.js" type="text/javascript"></script>
<script src="structure/pure/image.js" type="text/javascript"></script>
<script src="structure/pure/imagetrigger.js" type="text/javascript"></script>
<script src="structure/pure/include.js" type="text/javascript"></script>
Deleted: CometVisu/trunk/visu/structure/pure/iframe.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/iframe.js 2012-12-25 23:52:36 UTC (rev 1249)
+++ CometVisu/trunk/visu/structure/pure/iframe.js 2012-12-26 08:38:07 UTC (rev 1250)
@@ -1,46 +0,0 @@
-/* iframe.js (c) 2012 by Christian Mayer [CometVisu at ChristianMayer dot de]
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-basicdesign.addCreator('iframe', {
- create: function( element, path, flavour, type ) {
- var $e = $(element);
- var layout = $e.children('layout')[0];
- var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
- var ret_val = $('<div class="widget iframe" ' + style + '/>');
- ret_val.setWidgetLayout($e);
- if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
- if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- ret_val.append( extractLabel( $e.find('label')[0] ) );
- var iframeStyle = '';
- if( $e.attr('width' ) ) {
- iframeStyle += 'width:' + $e.attr('width' ) + ';';
- } else { // default width is 100% of widget space (fix bug #3175343 part 1)
- iframeStyle += 'width: 100%;';
- }
- if( $e.attr('height') ) iframeStyle += 'height:' + $e.attr('height') + ';';
- if( $e.attr('frameborder') == 'false' ) style += 'border: 0px ;';
- if( $e.attr('background') ) iframeStyle += 'background-color:' + $e.attr('background') + ';';
- if( iframeStyle != '' ) iframeStyle = 'style="' + iframeStyle + '"';
- var actor = '<div class="actor"><iframe src="' +$e.attr('src') + '" ' + iframeStyle + '></iframe></div>';
-
- var refresh = $e.attr('refresh') ? $e.attr('refresh')*1000 : 0;
- ret_val.append( $(actor).data( {
- 'refresh': refresh
- } ).each(setupRefreshAction) ); // abuse "each" to call in context...
- return ret_val;
- }
-});
\ No newline at end of file
Copied: CometVisu/trunk/visu/structure/pure/web.js (from rev 1248, CometVisu/trunk/visu/structure/pure/iframe.js)
===================================================================
--- CometVisu/trunk/visu/structure/pure/web.js (rev 0)
+++ CometVisu/trunk/visu/structure/pure/web.js 2012-12-26 08:38:07 UTC (rev 1250)
@@ -0,0 +1,46 @@
+/* web.js (c) 2012 by Christian Mayer [CometVisu at ChristianMayer dot de]
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+basicdesign.addCreator('web', {
+ create: function( element, path, flavour, type ) {
+ var $e = $(element);
+ var layout = $e.children('layout')[0];
+ var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
+ var ret_val = $('<div class="widget web" ' + style + '/>');
+ ret_val.setWidgetLayout($e);
+ if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
+ if( flavour ) ret_val.addClass( 'flavour_' + flavour );
+ ret_val.append( extractLabel( $e.find('label')[0] ) );
+ var webStyle = '';
+ if( $e.attr('width' ) ) {
+ webStyle += 'width:' + $e.attr('width' ) + ';';
+ } else { // default width is 100% of widget space (fix bug #3175343 part 1)
+ webStyle += 'width: 100%;';
+ }
+ if( $e.attr('height') ) webStyle += 'height:' + $e.attr('height') + ';';
+ if( $e.attr('frameborder') == 'false' ) style += 'border: 0px ;';
+ if( $e.attr('background') ) webStyle += 'background-color:' + $e.attr('background') + ';';
+ if( webStyle != '' ) webStyle = 'style="' + webStyle + '"';
+ var actor = '<div class="actor"><iframe src="' +$e.attr('src') + '" ' + webStyle + '></iframe></div>';
+
+ var refresh = $e.attr('refresh') ? $e.attr('refresh')*1000 : 0;
+ ret_val.append( $(actor).data( {
+ 'refresh': refresh
+ } ).each(setupRefreshAction) ); // abuse "each" to call in context...
+ return ret_val;
+ }
+});
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|