diff options
-rw-r--r-- | .gitattributes | 7 | ||||
-rw-r--r-- | demos/controls/protected/pages/HomePage.tpl | 4 | ||||
-rw-r--r-- | demos/controls/protected/pages/assets/fungii_logo.gif | bin | 5473 -> 0 bytes | |||
-rw-r--r-- | demos/controls/protected/themes/BlueTheme/buttons.skin | 2 | ||||
-rw-r--r-- | demos/controls/themes/BlueTheme/buttons.skin | 3 | ||||
-rw-r--r-- | demos/controls/themes/BlueTheme/icon_profile.gif | bin | 0 -> 771 bytes | |||
-rw-r--r-- | demos/controls/themes/BlueTheme/labels.skin (renamed from demos/controls/protected/themes/BlueTheme/labels.skin) | 0 | ||||
-rw-r--r-- | demos/images/fungii_logo.gif | bin | 5473 -> 0 bytes |
8 files changed, 8 insertions, 8 deletions
diff --git a/.gitattributes b/.gitattributes index 5a17d390..02e53e9e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,14 +6,13 @@ demos/controls/protected/pages/HomePage.tpl -text demos/controls/protected/pages/LoginPage.php -text demos/controls/protected/pages/LoginPage.tpl -text demos/controls/protected/pages/PlainPage.tpl -text -demos/controls/protected/pages/assets/fungii_logo.gif -text demos/controls/protected/pages/config.xml -text demos/controls/protected/pages/private/MemberPage.php -text demos/controls/protected/pages/private/MemberPage.tpl -text demos/controls/protected/pages/private/config.xml -text -demos/controls/protected/themes/BlueTheme/buttons.skin -text -demos/controls/protected/themes/BlueTheme/labels.skin -text -demos/images/fungii_logo.gif -text +demos/controls/themes/BlueTheme/buttons.skin -text +demos/controls/themes/BlueTheme/icon_profile.gif -text +demos/controls/themes/BlueTheme/labels.skin -text docs/conceptual-structure.vsd -text docs/request-sequence.vsd -text framework/.htaccess -text diff --git a/demos/controls/protected/pages/HomePage.tpl b/demos/controls/protected/pages/HomePage.tpl index 1e6f82ea..7774882e 100644 --- a/demos/controls/protected/pages/HomePage.tpl +++ b/demos/controls/protected/pages/HomePage.tpl @@ -5,8 +5,8 @@ <com:TLabel Text="label" /><br/>
<com:System.Web.UI.WebControls.TButton text="Toggle Button" ForeColor="red" Font.size="18" Click="testClick" /> (requires membership)<br/>
<com:TCheckBox Text="Checkbox" /><br/>
-<com:TImage ImageUrl=<%=$this->Page->getAsset('fungii_logo.gif') %> />
-<com:TImageButton ImageUrl=<%=$this->Page->getAsset('fungii_logo.gif')%> /><br/>
+<com:TImage ImageUrl=<%~/fungii_logo.gif %> />
+<com:TImageButton ImageUrl=<%~/fungii_logo.gif %> /><br/>
<com:THyperLink Text="Visit a 'classless' page" NavigateUrl="?sp=page.plain" /> |
<com:THyperLink Text="Visit member only page" NavigateUrl="?sp=page.private.member" />
</com:TForm>
\ No newline at end of file diff --git a/demos/controls/protected/pages/assets/fungii_logo.gif b/demos/controls/protected/pages/assets/fungii_logo.gif Binary files differdeleted file mode 100644 index b667c73e..00000000 --- a/demos/controls/protected/pages/assets/fungii_logo.gif +++ /dev/null diff --git a/demos/controls/protected/themes/BlueTheme/buttons.skin b/demos/controls/protected/themes/BlueTheme/buttons.skin deleted file mode 100644 index 9b155fd4..00000000 --- a/demos/controls/protected/themes/BlueTheme/buttons.skin +++ /dev/null @@ -1,2 +0,0 @@ -<com:TButton BackColor="blue" ForeColor="red" Font.Size="18px" />
-<com:TButton SkinID="abc" BackColor="red" ForeColor="blue" />
\ No newline at end of file diff --git a/demos/controls/themes/BlueTheme/buttons.skin b/demos/controls/themes/BlueTheme/buttons.skin new file mode 100644 index 00000000..8db810bc --- /dev/null +++ b/demos/controls/themes/BlueTheme/buttons.skin @@ -0,0 +1,3 @@ +<com:TButton BackColor="blue" ForeColor="red" Font.Size="18px" />
+<com:TButton SkinID="abc" BackColor="red" ForeColor="blue" />
+<com:TImageButton ImageUrl=<%~/icon_profile.gif%> />
\ No newline at end of file diff --git a/demos/controls/themes/BlueTheme/icon_profile.gif b/demos/controls/themes/BlueTheme/icon_profile.gif Binary files differnew file mode 100644 index 00000000..7ae1cdb8 --- /dev/null +++ b/demos/controls/themes/BlueTheme/icon_profile.gif diff --git a/demos/controls/protected/themes/BlueTheme/labels.skin b/demos/controls/themes/BlueTheme/labels.skin index 64a8c469..64a8c469 100644 --- a/demos/controls/protected/themes/BlueTheme/labels.skin +++ b/demos/controls/themes/BlueTheme/labels.skin diff --git a/demos/images/fungii_logo.gif b/demos/images/fungii_logo.gif Binary files differdeleted file mode 100644 index b667c73e..00000000 --- a/demos/images/fungii_logo.gif +++ /dev/null |