Permalink
Browse files

Merge branch 'master' of github.com:NicolasPetton/iliad

  • Loading branch information...
NicolasPetton committed Dec 2, 2011
2 parents 032ffdc + 26e4a81 commit d1edaaf6ecfe8e2304359d6447279930faad6f51
@@ -544,6 +544,11 @@ ILElement subclass: ILHTMLBuilderElement [
yourself
]
+ iframe [
+ <category: 'adding-conveniance'>
+ ^self add: ILIframeElement new
+ ]
+
javascript [
<category: 'adding-conveniance'>
^self script
@@ -0,0 +1,69 @@
+"======================================================================
+|
+| Iliad.ILIframeElement class definition
+|
+ ======================================================================"
+
+"======================================================================
+|
+| Copyright (c) 2008-2010
+| Nicolas Petton <petton.nicolas@gmail.com>,
+| Sébastien Audier <sebastien.audier@gmail.com>
+|
+|
+| This file is part of the Iliad framework.
+|
+| Permission is hereby granted, free of charge, to any person obtaining
+| a copy of this software and associated documentation files (the
+| 'Software'), to deal in the Software without restriction, including
+| without limitation the rights to use, copy, modify, merge, publish,
+| distribute, sublicense, and/or sell copies of the Software, and to
+| permit persons to whom the Software is furnished to do so, subject to
+| the following conditions:
+|
+| The above copyright notice and this permission notice shall be
+| included in all copies or substantial portions of the Software.
+|
+| THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+| IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+| CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+| TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+| SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+|
+ ======================================================================"
+
+
+
+ILHTMLBuilderElement subclass: ILIframeElement [
+
+ <comment: nil>
+ <category: 'Iliad-Core-XHTMLElements'>
+
+ tag [
+ <category: 'accessing'>
+ ^'iframe'
+ ]
+
+ src: aString [
+ <category: 'accessing attributes'>
+ self attributeAt: 'src' put: aString
+ ]
+
+ height: anInteger [
+ <category: 'accessing attributes'>
+ self attributeAt: 'height' put: anInteger greaseString
+ ]
+
+ name: aString [
+ <category: 'accessing attributes'>
+ self attributeAt: 'name' put: aString
+ ]
+
+ width: anInteger [
+ <category: 'accessing attributes'>
+ self attributeAt: 'width' put: anInteger greaseString
+ ]
+]
+
View
@@ -46,6 +46,7 @@ Eval [
filein: 'HTMLElements/ILBreakElement.st';
filein: 'HTMLElements/ILHorizontalRuleElement.st';
filein: 'HTMLElements/ILImageElement.st';
+ filein: 'HTMLElements/ILIframeElement.st';
filein: 'HTMLElements/ILMetaElement.st';
filein: 'HTMLElements/ILParameterElement.st';
filein: 'HTMLElements/ILDirectionElement.st';
View
@@ -39,6 +39,7 @@
<filein>HTMLElements/ILBreakElement.st</filein>
<filein>HTMLElements/ILHorizontalRuleElement.st</filein>
<filein>HTMLElements/ILImageElement.st</filein>
+ <filein>HTMLElements/ILIframeElement.st</filein>
<filein>HTMLElements/ILMetaElement.st</filein>
<filein>HTMLElements/ILParameterElement.st</filein>
<filein>HTMLElements/ILDirectionElement.st</filein>
@@ -150,6 +151,7 @@
<file>HTMLElements/ILBreakElement.st</file>
<file>HTMLElements/ILHorizontalRuleElement.st</file>
<file>HTMLElements/ILImageElement.st</file>
+ <file>HTMLElements/ILIframeElement.st</file>
<file>HTMLElements/ILMetaElement.st</file>
<file>HTMLElements/ILParameterElement.st</file>
<file>HTMLElements/ILDirectionElement.st</file>
@@ -225,16 +227,16 @@
<file>GST/ILDiskDirectory.st</file>
<file>GST/Extensions.st</file>
<file>postLoad.st</file>
- <file>Public/images/iliad_tiny.png</file>
- <file>Public/images/iliad.png</file>
- <file>Public/images/iliad_small.png</file>
- <file>Public/images/ajax_loader.gif</file>
+ <file>Public/stylesheets/iliad.css</file>
<file>Public/images/iliad_huge.png</file>
+ <file>Public/images/ajax_loader.gif</file>
+ <file>Public/images/iliad_small.png</file>
+ <file>Public/images/iliad_tiny.png</file>
<file>Public/images/iliad_bleached.png</file>
+ <file>Public/images/iliad.png</file>
<file>Public/images/iliad_big.png</file>
- <file>Public/stylesheets/iliad.css</file>
- <file>Public/javascripts/iliad.js</file>
<file>Public/javascripts/jquery-1.4.4.min.js</file>
- <file>Public/javascripts/no_conflict.js</file>
<file>Public/javascripts/iliad_ie_history.html</file>
+ <file>Public/javascripts/no_conflict.js</file>
+ <file>Public/javascripts/iliad.js</file>
</package>
View
@@ -37,7 +37,7 @@
ILBuildable subclass: ILField [
- | formula conditions errors customRows reader writer labelContents commentContents |
+ | formula conditions errors customRows reader writer labelContents commentContents cssClass |
<category: 'Iliad-More-Formula'>
<comment: nil>
@@ -120,6 +120,16 @@ ILBuildable subclass: ILField [
^commentContents
]
+ cssClass [
+ <category: 'accessing'>
+ ^cssClass ifNil: [cssClass := '']
+ ]
+
+ cssClass: aString [
+ <category: 'accessing'>
+ cssClass := aString
+ ]
+
value [
<category: 'accessing'>
^formula proxy perform: self reader
@@ -47,6 +47,7 @@ ILOptionField subclass: ILMultipleCheckboxField [
self options
do: [:each |
e checkbox
+ class: self cssClass;
checked: (self value includes: each);
action: [:boolean | boolean
ifTrue: [self add: each]
View
@@ -34,11 +34,11 @@
<file>ILMessageDecorator.st</file>
<file>ILApplicationBrowser.st</file>
<file>postLoad.st</file>
- <file>Public/images/arrow_down.png</file>
+ <file>Public/stylesheets/iliad-ui.css</file>
+ <file>Public/stylesheets/lightbox.css</file>
<file>Public/images/arrow_up.png</file>
+ <file>Public/images/arrow_down.png</file>
<file>Public/images/arrow_left.png</file>
<file>Public/images/arrow_right.png</file>
- <file>Public/stylesheets/lightbox.css</file>
- <file>Public/stylesheets/iliad-ui.css</file>
<file>Public/javascripts/lightbox.js</file>
</package>
Oops, something went wrong.

0 comments on commit d1edaaf

Please sign in to comment.