Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[826] CometVisu/trunk/visu
|
From: <ma...@us...> - 2012-05-17 20:48:11
|
Revision: 826
http://openautomation.svn.sourceforge.net/openautomation/?rev=826&view=rev
Author: mayerch
Date: 2012-05-17 20:48:03 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Highly improved icon handling:
- ability to redirect in the icon definition
- support for types
- support for flavours
- icon support in <text>
- show all of this in the demo config
Changed colspan/rowspan handling: the spans have to be defined in the <layout> now
Modified Paths:
--------------
CometVisu/trunk/visu/designs/designglobals.css
CometVisu/trunk/visu/designs/pure/design_setup.js
CometVisu/trunk/visu/lib/iconhandler.js
CometVisu/trunk/visu/structure/pure/_common.js
CometVisu/trunk/visu/structure/pure/text.js
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/designs/designglobals.css
===================================================================
--- CometVisu/trunk/visu/designs/designglobals.css 2012-05-17 20:40:11 UTC (rev 825)
+++ CometVisu/trunk/visu/designs/designglobals.css 2012-05-17 20:48:03 UTC (rev 826)
@@ -32,10 +32,6 @@
clear: both;
}
-.icon {
- height: 2em;
-}
-
/*
* colspans, each design needs to define a colspan0
* class, this class is the default widget size
Modified: CometVisu/trunk/visu/designs/pure/design_setup.js
===================================================================
--- CometVisu/trunk/visu/designs/pure/design_setup.js 2012-05-17 20:40:11 UTC (rev 825)
+++ CometVisu/trunk/visu/designs/pure/design_setup.js 2012-05-17 20:48:03 UTC (rev 826)
@@ -22,120 +22,270 @@
//////////////////////////////////////////////////////////////////////////////
icons.insert({
- 'audio_audio' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_audio.png' } } },
- 'audio_eject' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_eject.png' } } },
- 'audio_ff' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_ff.png' } } },
- 'audio_mute' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_mute.png' } } },
- 'audio_pause' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_pause.png' } } },
- 'audio_playliste' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_playliste.png' } } },
- 'audio_play' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_play.png' } } },
- 'audio_rec' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_rec.png' } } },
- 'audio_rew' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_rew.png' } } },
- 'audio_sound' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_sound.png' } } },
- 'audio_stop' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_stop.png' } } },
- 'fts_fenster_gekippt' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster_gekippt.png' } } },
- 'fts_fenster_offen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster_offen.png' } } },
- 'fts_fenster' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster.png' } } },
- 'fts_garage' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_garage.png' } } },
- 'fts_markise' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_markise.png' } } },
- 'fts_rollo' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_rollo.png' } } },
- 'fts_tuer_offen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_tuer_offen.png' } } },
- 'fts_tuer' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_tuer.png' } } },
- 'it_fernsehen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_fernsehen.png' } } },
- 'it_funk_dcf77' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_funk_dcf77.png' } } },
- 'it_internet' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_internet.png' } } },
- 'it_kamera' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_kamera.png' } } },
- 'it_nas' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_nas.png' } } },
- 'it_netz' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_netz.png' } } },
- 'it_netzwerk' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_netzwerk.png' } } },
- 'it_pc' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_pc.png' } } },
- 'it_radio' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_radio.png' } } },
- 'it_router' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_router.png' } } },
- 'it_server' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_server.png' } } },
- 'it_smartphone' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_smartphone.png' } } },
- 'it_telefon' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_telefon.png' } } },
- 'it_wlan' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_wlan.png' } } },
- 'licht_esstisch' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_esstisch.png' } } },
- 'licht_indirekt' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_indirekt.png' } } },
- 'licht_led' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_led.png' } } },
- 'licht_lichterkette' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_lichterkette.png' } } },
- 'licht_licht' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_licht.png' } } },
- 'licht_party' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_party.png' } } },
- 'licht_regelung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_regelung.png' } } },
- 'licht_stehlampe' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_stehlampe.png' } } },
- 'meld_achtung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_achtung.png' } } },
- 'meld_medizin' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_medizin.png' } } },
- 'meld_post_offen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_post_offen.png' } } },
- 'meld_post' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_post.png' } } },
- 'meld_service' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_service.png' } } },
- 'meld_steckdose' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_steckdose.png' } } },
- 'sani_bewaesserung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_bewaesserung.png' } } },
- 'sani_fussbodenheizung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_fussbodenheizung.png' } } },
- 'sani_heizung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_heizung.png' } } },
- 'sani_kessel_temp' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_kessel_temp.png' } } },
- 'sani_lueftung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_lueftung.png' } } },
- 'sani_lueftung_regelung': { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_lueftung_regelung.png' } } },
- 'sani_pumpe' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_pumpe.png' } } },
- 'sani_solar' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_solar.png' } } },
- 'sani_solar_temp' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_solar_temp.png' } } },
- 'sani_wasserhahn' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_wasserhahn.png' } } },
- 'secur_alarmanlage' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_alarmanlage.png' } } },
- 'secur_codierung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_codierung.png' } } },
- 'secur_frostschutz' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_frostschutz.png' } } },
- 'secur_hitzeschutz' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_hitzeschutz.png' } } },
- 'secur_offen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_offen.png' } } },
- 'secur_rauchmelder' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_rauchmelder.png' } } },
- 'secur_zu' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_zu.png' } } },
- 'steuer_ab' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_ab.png' } } },
- 'steuer_alles_ein_aus' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_alles_ein_aus.png' } } },
- 'steuer_auf' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_auf.png' } } },
- 'steuer_aussen_ein_aus' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_aussen_ein_aus.png' } } },
- 'steuer_ein_aus' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_ein_aus.png' } } },
- 'steuer_home' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_home.png' } } },
- 'steuer_minus' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_minus.png' } } },
- 'steuer_plus' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_plus.png' } } },
- 'steuer_standby' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_standby.png' } } },
- 'steuer_vor' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_vor.png' } } },
- 'steuer_x' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_x.png' } } },
- 'steuer_zurueck' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_zurueck.png' } } },
- 'szene_essen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_essen.png' } } },
- 'szene_garten' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_garten.png' } } },
- 'szene_kochen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_kochen.png' } } },
- 'szene_making_love' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_making_love.png' } } },
- 'szene_nacht' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_nacht.png' } } },
- 'szene_party' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_party.png' } } },
- 'szene_pool' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_pool.png' } } },
- 'szene_schlafen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_schlafen.png' } } },
- 'szene_schwimmen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_schwimmen.png' } } },
- 'szene_szene' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_szene.png' } } },
- 'szene_terrasse' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_terrasse.png' } } },
- 'szene_toilette' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_toilette.png' } } },
- 'szene_weihnachten' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_weihnachten.png' } } },
- 'temp_aussen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_aussen.png' } } },
- 'temp_frost' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_frost.png' } } },
- 'temp_innen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_innen.png' } } },
- 'temp_regelung' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_regelung.png' } } },
- 'temp_temperatur' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_temperatur.png' } } },
- 'user_abwesend' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/user_abwesend.png' } } },
- 'user_anwesend' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/user_anwesend.png' } } },
- 'user_ext_away' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/user_ext_away.png' } } },
- 'wetter_bewoelkt' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_bewoelkt.png' } } },
- 'wetter_feuchtigkeit' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_feuchtigkeit.png' } } },
- 'wetter_gewitter' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_gewitter.png' } } },
- 'wetter_pollen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_pollen.png' } } },
- 'wetter_regen' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_regen.png' } } },
- 'wetter_schnee' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_schnee.png' } } },
- 'wetter_sommer' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_sommer.png' } } },
- 'wetter_sonne' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_sonne.png' } } },
- 'wetter_unwetter' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_unwetter.png' } } },
- 'wetter_wind' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_wind.png' } } },
- 'wetter_winter' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_winter.png' } } },
- 'zeit_automatik' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_automatik.png' } } },
- 'zeit_diagramm' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_diagramm.png' } } },
- 'zeit_ecomode' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_ecomode.png' } } },
- 'zeit_handbetrieb' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_handbetrieb.png' } } },
- 'zeit_kalender' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_kalender.png' } } },
- 'zeit_notiz' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_notiz.png' } } },
- 'zeit_statistik' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_statistik.png' } } },
- 'zeit_uhr' : { '*': { '*': { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_uhr.png' } } }
+ 'CometVisu' : { '*' : '128',
+ '16' : { '*' : 'sodium' ,
+ 'black' : { 'uri': 'icon/comet_16_000000.png' },
+ 'white' : { 'uri': 'icon/comet_16_ffffff.png' },
+ 'antimony' : { 'uri': 'icon/comet_16_00ddff.png' },
+ 'boron' : { 'uri': 'icon/comet_16_00ff11.png' },
+ 'lithium' : { 'uri': 'icon/comet_16_ff0000.png' },
+ 'potassium' : { 'uri': 'icon/comet_16_d00055.png' },
+ 'sodium' : { 'uri': 'icon/comet_16_ff8000.png' } },
+ '32' : { '*' : 'sodium' ,
+ 'black' : { 'uri': 'icon/comet_32_000000.png' },
+ 'white' : { 'uri': 'icon/comet_32_ffffff.png' },
+ 'antimony' : { 'uri': 'icon/comet_32_00ddff.png' },
+ 'boron' : { 'uri': 'icon/comet_32_00ff11.png' },
+ 'lithium' : { 'uri': 'icon/comet_32_ff0000.png' },
+ 'potassium' : { 'uri': 'icon/comet_32_d00055.png' },
+ 'sodium' : { 'uri': 'icon/comet_32_ff8000.png' } },
+ '64' : { '*' : 'sodium' ,
+ 'black' : { 'uri': 'icon/comet_64_000000.png' },
+ 'white' : { 'uri': 'icon/comet_64_ffffff.png' },
+ 'antimony' : { 'uri': 'icon/comet_64_00ddff.png' },
+ 'boron' : { 'uri': 'icon/comet_64_00ff11.png' },
+ 'lithium' : { 'uri': 'icon/comet_64_ff0000.png' },
+ 'potassium' : { 'uri': 'icon/comet_64_d00055.png' },
+ 'sodium' : { 'uri': 'icon/comet_64_ff8000.png' } },
+ '128': { '*' : 'sodium' ,
+ 'black' : { 'uri': 'icon/comet_128_000000.png' },
+ 'white' : { 'uri': 'icon/comet_128_ffffff.png' },
+ 'antimony' : { 'uri': 'icon/comet_128_00ddff.png' },
+ 'boron' : { 'uri': 'icon/comet_128_00ff11.png' },
+ 'lithium' : { 'uri': 'icon/comet_128_ff0000.png' },
+ 'potassium' : { 'uri': 'icon/comet_128_d00055.png' },
+ 'sodium' : { 'uri': 'icon/comet_128_ff8000.png' } } },
+ 'audio_audio' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_audio.png' , 'style': 'height: 2em;' },
+ 'sodium' : { 'uri': 'icon/knx-uf-iconset/128x128_or/audio_audio.png' , 'style': 'height: 2em;' } } },
+ 'audio_eject' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_eject.png' , 'style': 'height: 2em;' } } },
+ 'audio_ff' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_ff.png' , 'style': 'height: 2em;' } } },
+ 'audio_mute' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_mute.png' , 'style': 'height: 2em;' } } },
+ 'audio_pause' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_pause.png' , 'style': 'height: 2em;' } } },
+ 'audio_playliste' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_playliste.png' , 'style': 'height: 2em;' } } },
+ 'audio_play' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_play.png' , 'style': 'height: 2em;' } } },
+ 'audio_rec' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_rec.png' , 'style': 'height: 2em;' } } },
+ 'audio_rew' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_rew.png' , 'style': 'height: 2em;' } } },
+ 'audio_sound' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_sound.png' , 'style': 'height: 2em;' } } },
+ 'audio_stop' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/audio_stop.png' , 'style': 'height: 2em;' } } },
+ 'fts_fenster_gekippt' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster_gekippt.png' , 'style': 'height: 2em;' } } },
+ 'fts_fenster_offen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster_offen.png' , 'style': 'height: 2em;' } } },
+ 'fts_fenster' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_fenster.png' , 'style': 'height: 2em;' } } },
+ 'fts_garage' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_garage.png' , 'style': 'height: 2em;' } } },
+ 'fts_markise' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_markise.png' , 'style': 'height: 2em;' } } },
+ 'fts_rollo' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_rollo.png' , 'style': 'height: 2em;' } } },
+ 'fts_tuer_offen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_tuer_offen.png' , 'style': 'height: 2em;' } } },
+ 'fts_tuer' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/fts_tuer.png' , 'style': 'height: 2em;' } } },
+ 'it_fernsehen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_fernsehen.png' , 'style': 'height: 2em;' } } },
+ 'it_funk_dcf77' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_funk_dcf77.png' , 'style': 'height: 2em;' } } },
+ 'it_internet' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_internet.png' , 'style': 'height: 2em;' } } },
+ 'it_kamera' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_kamera.png' , 'style': 'height: 2em;' } } },
+ 'it_nas' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_nas.png' , 'style': 'height: 2em;' } } },
+ 'it_netz' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_netz.png' , 'style': 'height: 2em;' } } },
+ 'it_netzwerk' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_netzwerk.png' , 'style': 'height: 2em;' } } },
+ 'it_pc' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_pc.png' , 'style': 'height: 2em;' } } },
+ 'it_radio' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_radio.png' , 'style': 'height: 2em;' } } },
+ 'it_router' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_router.png' , 'style': 'height: 2em;' } } },
+ 'it_server' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_server.png' , 'style': 'height: 2em;' } } },
+ 'it_smartphone' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_smartphone.png' , 'style': 'height: 2em;' } } },
+ 'it_telefon' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_telefon.png' , 'style': 'height: 2em;' } } },
+ 'it_wlan' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/it_wlan.png' , 'style': 'height: 2em;' } } },
+ 'licht_esstisch' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_esstisch.png' , 'style': 'height: 2em;' } } },
+ 'licht_indirekt' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_indirekt.png' , 'style': 'height: 2em;' } } },
+ 'licht_led' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_led.png' , 'style': 'height: 2em;' } } },
+ 'licht_lichterkette' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_lichterkette.png' , 'style': 'height: 2em;' } } },
+ 'licht_licht' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_licht.png' , 'style': 'height: 2em;' } } },
+ 'licht_party' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_party.png' , 'style': 'height: 2em;' } } },
+ 'licht_regelung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_regelung.png' , 'style': 'height: 2em;' } } },
+ 'licht_stehlampe' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/licht_stehlampe.png' , 'style': 'height: 2em;' } } },
+ 'meld_achtung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_achtung.png' , 'style': 'height: 2em;' } } },
+ 'meld_medizin' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_medizin.png' , 'style': 'height: 2em;' } } },
+ 'meld_post_offen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_post_offen.png' , 'style': 'height: 2em;' } } },
+ 'meld_post' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_post.png' , 'style': 'height: 2em;' } } },
+ 'meld_service' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_service.png' , 'style': 'height: 2em;' } } },
+ 'meld_steckdose' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/meld_steckdose.png' , 'style': 'height: 2em;' } } },
+ 'sani_bewaesserung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_bewaesserung.png' , 'style': 'height: 2em;' } } },
+ 'sani_fussbodenheizung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_fussbodenheizung.png' , 'style': 'height: 2em;' } } },
+ 'sani_heizung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_heizung.png' , 'style': 'height: 2em;' } } },
+ 'sani_kessel_temp' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_kessel_temp.png' , 'style': 'height: 2em;' } } },
+ 'sani_lueftung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_lueftung.png' , 'style': 'height: 2em;' } } },
+ 'sani_lueftung_regelung': { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_lueftung_regelung.png' , 'style': 'height: 2em;' } } },
+ 'sani_pumpe' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_pumpe.png' , 'style': 'height: 2em;' } } },
+ 'sani_solar' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_solar.png' , 'style': 'height: 2em;' } } },
+ 'sani_solar_temp' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_solar_temp.png' , 'style': 'height: 2em;' } } },
+ 'sani_wasserhahn' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/sani_wasserhahn.png' , 'style': 'height: 2em;' } } },
+ 'secur_alarmanlage' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_alarmanlage.png' , 'style': 'height: 2em;' } } },
+ 'secur_codierung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_codierung.png' , 'style': 'height: 2em;' } } },
+ 'secur_frostschutz' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_frostschutz.png' , 'style': 'height: 2em;' } } },
+ 'secur_hitzeschutz' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_hitzeschutz.png' , 'style': 'height: 2em;' } } },
+ 'secur_offen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_offen.png' , 'style': 'height: 2em;' } } },
+ 'secur_rauchmelder' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_rauchmelder.png' , 'style': 'height: 2em;' } } },
+ 'secur_zu' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/secur_zu.png' , 'style': 'height: 2em;' } } },
+ 'steuer_ab' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_ab.png' , 'style': 'height: 2em;' } } },
+ 'steuer_alles_ein_aus' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_alles_ein_aus.png' , 'style': 'height: 2em;' } } },
+ 'steuer_auf' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_auf.png' , 'style': 'height: 2em;' } } },
+ 'steuer_aussen_ein_aus' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_aussen_ein_aus.png' , 'style': 'height: 2em;' } } },
+ 'steuer_ein_aus' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_ein_aus.png' , 'style': 'height: 2em;' } } },
+ 'steuer_home' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_home.png' , 'style': 'height: 2em;' } } },
+ 'steuer_minus' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_minus.png' , 'style': 'height: 2em;' } } },
+ 'steuer_plus' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_plus.png' , 'style': 'height: 2em;' } } },
+ 'steuer_standby' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_standby.png' , 'style': 'height: 2em;' } } },
+ 'steuer_vor' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_vor.png' , 'style': 'height: 2em;' } } },
+ 'steuer_x' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_x.png' , 'style': 'height: 2em;' } } },
+ 'steuer_zurueck' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/steuer_zurueck.png' , 'style': 'height: 2em;' } } },
+ 'szene_essen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_essen.png' , 'style': 'height: 2em;' } } },
+ 'szene_garten' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_garten.png' , 'style': 'height: 2em;' } } },
+ 'szene_kochen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_kochen.png' , 'style': 'height: 2em;' } } },
+ 'szene_making_love' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_making_love.png' , 'style': 'height: 2em;' } } },
+ 'szene_nacht' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_nacht.png' , 'style': 'height: 2em;' } } },
+ 'szene_party' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_party.png' , 'style': 'height: 2em;' } } },
+ 'szene_pool' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_pool.png' , 'style': 'height: 2em;' } } },
+ 'szene_schlafen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_schlafen.png' , 'style': 'height: 2em;' } } },
+ 'szene_schwimmen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_schwimmen.png' , 'style': 'height: 2em;' } } },
+ 'szene_szene' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_szene.png' , 'style': 'height: 2em;' } } },
+ 'szene_terrasse' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_terrasse.png' , 'style': 'height: 2em;' } } },
+ 'szene_toilette' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_toilette.png' , 'style': 'height: 2em;' } } },
+ 'szene_weihnachten' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/szene_weihnachten.png' , 'style': 'height: 2em;' } } },
+ 'temp_aussen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_aussen.png' , 'style': 'height: 2em;' } } },
+ 'temp_frost' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_frost.png' , 'style': 'height: 2em;' } } },
+ 'temp_innen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_innen.png' , 'style': 'height: 2em;' } } },
+ 'temp_regelung' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_regelung.png' , 'style': 'height: 2em;' } } },
+ 'temp_temperatur' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/temp_temperatur.png' , 'style': 'height: 2em;' } } },
+ 'user_abwesend' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/user_abwesend.png' , 'style': 'height: 2em;' } } },
+ 'user_anwesend' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/user_anwesend.png' , 'style': 'height: 2em;' } } },
+ 'user_ext_away' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/user_ext_away.png' , 'style': 'height: 2em;' } } },
+ 'wetter_bewoelkt' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_bewoelkt.png' , 'style': 'height: 2em;' } } },
+ 'wetter_feuchtigkeit' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_feuchtigkeit.png' , 'style': 'height: 2em;' } } },
+ 'wetter_gewitter' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_gewitter.png' , 'style': 'height: 2em;' } } },
+ 'wetter_pollen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_pollen.png' , 'style': 'height: 2em;' } } },
+ 'wetter_regen' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_regen.png' , 'style': 'height: 2em;' } } },
+ 'wetter_schnee' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_schnee.png' , 'style': 'height: 2em;' } } },
+ 'wetter_sommer' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_sommer.png' , 'style': 'height: 2em;' } } },
+ 'wetter_sonne' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_sonne.png' , 'style': 'height: 2em;' } } },
+ 'wetter_unwetter' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_unwetter.png' , 'style': 'height: 2em;' } } },
+ 'wetter_wind' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_wind.png' , 'style': 'height: 2em;' } } },
+ 'wetter_winter' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/wetter_winter.png' , 'style': 'height: 2em;' } } },
+ 'zeit_automatik' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_automatik.png' , 'style': 'height: 2em;' } } },
+ 'zeit_diagramm' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_diagramm.png' , 'style': 'height: 2em;' } } },
+ 'zeit_ecomode' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_ecomode.png' , 'style': 'height: 2em;' } } },
+ 'zeit_handbetrieb' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_handbetrieb.png' , 'style': 'height: 2em;' } } },
+ 'zeit_kalender' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_kalender.png' , 'style': 'height: 2em;' } } },
+ 'zeit_notiz' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_notiz.png' , 'style': 'height: 2em;' } } },
+ 'zeit_statistik' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_statistik.png' , 'style': 'height: 2em;' } } },
+ 'zeit_uhr' : { '*': { '*' : 'white',
+ 'white' : { 'uri': 'icon/knx-uf-iconset/128x128_ws/zeit_uhr.png' , 'style': 'height: 2em;' } } }
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/lib/iconhandler.js
===================================================================
--- CometVisu/trunk/visu/lib/iconhandler.js 2012-05-17 20:40:11 UTC (rev 825)
+++ CometVisu/trunk/visu/lib/iconhandler.js 2012-05-17 20:48:03 UTC (rev 826)
@@ -109,10 +109,15 @@
this.get = function()
{
var name = arguments[0];
- var type = arguments[1] || '*';
- var flavour = arguments[2] || '*';
+ var type = arguments[1];
+ var flavour = arguments[2];
- if( !db[ name ] || !db[ name ][ type ] ) return undefined;
+ if( !db[ name ] ) return undefined;
+ if( !db[ name ][ type ] ) type = '*'; // undefined -> use default
+ if( typeof db[ name ][ type ] === 'string' ) type = db[ name ][ type ]; // redirect link
+ if( !db[ name ][ type ][ flavour ] ) flavour = '*'; // undefined -> use default
+ if( typeof db[ name ][ type ][ flavour ] === 'string' ) flavour = db[ name ][ type ][ flavour ]; // redirect link
+
return db[ name ][ type ][ flavour ];
}
@@ -130,7 +135,7 @@
if( i.icon ) return i.icon;
// fetch and cache image
- i.icon = $( '<img class="icon" src="' + i.uri + '" />' );
+ i.icon = $( '<img class="icon" src="' + i.uri + '" ' + ( i.style ? 'style="' + i.style + '" ' : '' ) + '/>' );
return i.icon;
}
}
Modified: CometVisu/trunk/visu/structure/pure/_common.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/_common.js 2012-05-17 20:40:11 UTC (rev 825)
+++ CometVisu/trunk/visu/structure/pure/_common.js 2012-05-17 20:48:03 UTC (rev 826)
@@ -60,9 +60,9 @@
*/
$.fn.setWidgetLayout = function(page) {
- this.data('colspan', page.attr('colspan') || $('head').data('colspanDefault'));
- if (page.attr('rowspan')) {
- this.data('rowspanClass', rowspanClass(page.attr('rowspan') || 1));
+ this.data('colspan', page.children('layout').attr('colspan') || $('head').data('colspanDefault'));
+ if (page.children('layout').attr('rowspan')) {
+ this.data('rowspanClass', rowspanClass(page.children('layout').attr('rowspan') || 1));
this.addClass('innerrowspan');
}
return this;
@@ -425,7 +425,7 @@
var i = icons.getIcon( $v.attr('name') );
if( i ) $div.append( i.clone() );
} else
- $div.append( $v.clone() );
+ $div.append( this.textContent );
});
return $div;
}
Modified: CometVisu/trunk/visu/structure/pure/text.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/text.js 2012-05-17 20:40:11 UTC (rev 825)
+++ CometVisu/trunk/visu/structure/pure/text.js 2012-05-17 20:48:03 UTC (rev 826)
@@ -16,7 +16,7 @@
*/
basicdesign.addCreator('text', {
- create: function( element, path ) {
+ create: function( element, path, flavour ) {
var $e = $(element);
var layout = $e.children('layout')[0];
var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
@@ -25,7 +25,17 @@
var style = '';
if( $e.attr('align') ) style += 'text-align:' + $e.attr('align') + ';';
if( style != '' ) style = 'style="' + style + '"';
- ret_val.append( '<div ' + style + '>' + element.textContent + '</div>' );
+ var $div = $( '<div ' + style + '></div>' );
+ $e.contents().each( function(){
+ var $v = $(this);
+ if( $v.is('icon') )
+ {
+ var i = icons.getIcon( $v.attr('name'), $v.attr('type'), flavour );
+ if( i ) $div.append( i.clone() );
+ } else
+ $div.append( this.textContent );
+ });
+ ret_val.append( $div );
return ret_val;
},
attributes: {
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-05-17 20:40:11 UTC (rev 825)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-05-17 20:48:03 UTC (rev 826)
@@ -260,6 +260,7 @@
<text>An empty page</text>
<line/>
</page>
+ <text><icon name="CometVisu" type="64" />Text with Icon</text>
</page>
<page name="Flavour: Boron" align="center" flavour="boron">
<text align="center">CometVisu Boron flavour</text>
@@ -268,6 +269,7 @@
<text>An empty page</text>
<line/>
</page>
+ <text><icon name="CometVisu" type="64" />Text with Icon</text>
</page>
<page name="Flavour: Lithium" align="center" flavour="lithium">
<text align="center">CometVisu Lithium flavour</text>
@@ -276,6 +278,7 @@
<text>An empty page</text>
<line/>
</page>
+ <text><icon name="CometVisu" type="64" />Text with Icon</text>
</page>
<page name="Flavour: Potassium" align="center" flavour="potassium">
<text align="center">CometVisu Potassium flavour</text>
@@ -284,6 +287,7 @@
<text>An empty page</text>
<line/>
</page>
+ <text><icon name="CometVisu" type="64" />Text with Icon</text>
</page>
<page name="Flavour: Sodium" align="center" flavour="sodium">
<text align="center">CometVisu Sodium flavour</text>
@@ -292,6 +296,7 @@
<text>An empty page</text>
<line/>
</page>
+ <text><icon name="CometVisu" type="64" />Text with Icon</text>
</page>
<line />
<page name="Flavour: black" align="center" flavour="black">
@@ -301,6 +306,7 @@
<text>An empty page</text>
<line/>
</page>
+ <text><icon name="CometVisu" type="64" />Text with Icon</text>
</page>
<page name="Flavour: white" align="center" flavour="white">
<text align="center">CometVisu white flavour</text>
@@ -309,6 +315,7 @@
<text>An empty page</text>
<line/>
</page>
+ <text><icon name="CometVisu" type="64" />Text with Icon</text>
</page>
</page>
<page name="Format Test" align="center">
@@ -422,6 +429,25 @@
<address transform="DPT:9" type="">12/7/10</address>
</slide>
</page>
+ <page name="Icon Test" align="center">
+ <text><icon name="CometVisu" type="64" /> Icon links vom Text</text>
+ <text>Icon <icon name="CometVisu" type="64" /> mitten im Text</text>
+ <text>Icon rechts vom Text <icon name="CometVisu" type="64" /></text>
+ <text><icon name="CometVisu" type="64" /> Mehrere Icons <icon name="CometVisu" type="64" /></text>
+ <line />
+ <text><icon name="CometVisu" type="16" /> Icon mit type="16"</text>
+ <text><icon name="CometVisu" type="32" /> Icon mit type="32"</text>
+ <text><icon name="CometVisu" type="64" /> Icon mit type="64"</text>
+ <text><icon name="CometVisu" type="128" /> Icon mit type="128"</text>
+ <line />
+ <page name="Subpage mit Flavour" flavour="lithium" align="center" >
+ <text><icon name="CometVisu" type="64" /> Icon links vom Text</text>
+ <page name="Subpage mit anderem Flavour" flavour="antimony" align="center" >
+ <text><icon name="CometVisu" type="64" /> Icon links vom Text</text>
+ </page>
+ </page>
+ </page>
+ <break/>
<page name="2D fixed Bitmap" type="2d" backdrop="media/demo_2d_backdrop_nikolaushaus.png" align="center">
<switch mapping="On_Off" styling="Red_Green">
<layout x="200px" y="300px" width="600px" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
