diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2012-12-19 08:32:50 -0800 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2012-12-19 08:32:50 -0800 |
| commit | 6a5a6fa8a87f11029b715014dccff778b687c7b8 (patch) | |
| tree | e7b7ea75e51f360dbc8d71cc8ccd3d918669669e | |
| parent | c4410b8965f251593d074b576252e822120d2b47 (diff) | |
| parent | bccf76e713c249b2f71de9fc7904a7cd7cd45258 (diff) | |
Merge pull request #1941 from ronie/confluence-weekend
[Confluence] fix weekend forecast
| -rw-r--r-- | addons/skin.confluence/720p/weather/WeekendForecast.xml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/addons/skin.confluence/720p/weather/WeekendForecast.xml b/addons/skin.confluence/720p/weather/WeekendForecast.xml index 6b0b282bef..23bfb77158 100644 --- a/addons/skin.confluence/720p/weather/WeekendForecast.xml +++ b/addons/skin.confluence/720p/weather/WeekendForecast.xml @@ -56,7 +56,7 @@ <textcolor>blue</textcolor> <align>center</align> <aligny>center</aligny> - <label>$INFO[Window.Property(Weekend.2.LongDay)] - $INFO[Window.Property(Weekend.2.ShortDate)]</label> + <label>$INFO[Window.Property(Weekend.1.LongDay)] - $INFO[Window.Property(Weekend.1.ShortDate)]</label> </control> <control type="image"> <posx>10</posx> @@ -64,7 +64,7 @@ <width>130</width> <height>160</height> <aspectratio>keep</aspectratio> - <texture>$INFO[Window.Property(Weekend.2.OutlookIcon)]</texture> + <texture>$INFO[Window.Property(Weekend.1.OutlookIcon)]</texture> </control> <control type="label"> <posx>140</posx> @@ -76,7 +76,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.2.HighTemperature),[B] ,[/B]]</label> + <label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.1.HighTemperature),[B] ,[/B]]</label> </control> <control type="label"> <posx>140</posx> @@ -88,7 +88,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.2.LowTemperature),[B] ,[/B]]</label> + <label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.1.LowTemperature),[B] ,[/B]]</label> </control> <control type="textbox"> <posx>240</posx> @@ -98,7 +98,7 @@ <font>font12</font> <textcolor>white</textcolor> <align>right</align> - <label>$INFO[Window.Property(Weekend.2.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.2.ShortWindDirection),[COLOR=grey2]$LOCALIZE[404] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.2.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]]</label> + <label>$INFO[Window.Property(Weekend.1.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.1.ShortWindDirection),[COLOR=grey2]$LOCALIZE[404] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.1.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]]</label> </control> <control type="label"> <posx>0</posx> @@ -110,7 +110,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>$INFO[Window.Property(Weekend.2.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]]</label> + <label>$INFO[Window.Property(Weekend.1.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]]</label> </control> <control type="textbox"> <posx>0</posx> @@ -121,7 +121,7 @@ <textcolor>white</textcolor> <selectedcolor>selected</selectedcolor> <align>center</align> - <label>$INFO[Window.Property(Weekend.2.LongOutlookDay),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]][CR]</label> + <label>$INFO[Window.Property(Weekend.1.LongOutlookDay),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]][CR]</label> </control> <control type="image"> <posx>0</posx> @@ -143,7 +143,7 @@ <textcolor>blue</textcolor> <align>center</align> <aligny>center</aligny> - <label>$INFO[Window.Property(Weekend.3.LongDay)] - $INFO[Window.Property(Weekend.3.ShortDate)]</label> + <label>$INFO[Window.Property(Weekend.2.LongDay)] - $INFO[Window.Property(Weekend.2.ShortDate)]</label> </control> <control type="image"> <posx>10</posx> @@ -151,7 +151,7 @@ <width>130</width> <height>160</height> <aspectratio>keep</aspectratio> - <texture>$INFO[Window.Property(Weekend.3.OutlookIcon)]</texture> + <texture>$INFO[Window.Property(Weekend.2.OutlookIcon)]</texture> </control> <control type="label"> <posx>140</posx> @@ -163,7 +163,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.3.HighTemperature),[B] ,[/B]]</label> + <label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.2.HighTemperature),[B] ,[/B]]</label> </control> <control type="label"> <posx>140</posx> @@ -175,7 +175,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.3.LowTemperature),[B] ,[/B]]</label> + <label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.2.LowTemperature),[B] ,[/B]]</label> </control> <control type="textbox"> <posx>240</posx> @@ -185,7 +185,7 @@ <font>font12</font> <textcolor>white</textcolor> <align>right</align> - <label>$INFO[Window.Property(Weekend.3.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.3.ShortWindDirection),[COLOR=grey2]$LOCALIZE[404] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.3.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]]</label> + <label>$INFO[Window.Property(Weekend.2.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.2.ShortWindDirection),[COLOR=grey2]$LOCALIZE[404] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.2.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]]</label> </control> <control type="label"> <posx>0</posx> @@ -197,7 +197,7 @@ <selectedcolor>selected</selectedcolor> <align>center</align> <aligny>center</aligny> - <label>$INFO[Window.Property(Weekend.3.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]]</label> + <label>$INFO[Window.Property(Weekend.2.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]]</label> </control> <control type="textbox"> <posx>0</posx> @@ -208,7 +208,7 @@ <textcolor>white</textcolor> <selectedcolor>selected</selectedcolor> <align>center</align> - <label>$INFO[Window.Property(Weekend.3.LongOutlookDay),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]][CR]</label> + <label>$INFO[Window.Property(Weekend.2.LongOutlookDay),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]][CR]</label> </control> </control> </control> |