Moved the *_CSS_* class in their own (draft) library, since they are not CMS specific.

This commit is contained in:
Jocelyn Fiat
2013-03-22 15:07:45 +01:00
parent 5eb1f89273
commit a4095b4e16
7 changed files with 56 additions and 11 deletions

View File

@@ -14,6 +14,7 @@
<setting name="concurrency" value="thread"/> <setting name="concurrency" value="thread"/>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/> <library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="encoder" location="..\..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/> <library name="encoder" location="..\..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
<library name="css" location="..\..\library\text\css\css-safe.ecf" readonly="false"/>
<library name="http" location="..\..\..\library\network\protocol\http\http-safe.ecf" readonly="false"/> <library name="http" location="..\..\..\library\network\protocol\http\http-safe.ecf" readonly="false"/>
<library name="openid" location="..\..\..\library\security\openid\consumer\openid-safe.ecf" readonly="false"/> <library name="openid" location="..\..\..\library\security\openid\consumer\openid-safe.ecf" readonly="false"/>
<library name="process" location="$ISE_LIBRARY\library\process\process-safe.ecf"/> <library name="process" location="$ISE_LIBRARY\library\process\process-safe.ecf"/>

View File

@@ -15,6 +15,7 @@
<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/> <library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
<library name="encoder" location="..\..\..\library\text\encoder\encoder.ecf" readonly="false"/> <library name="encoder" location="..\..\..\library\text\encoder\encoder.ecf" readonly="false"/>
<library name="css" location="..\..\library\text\css\css.ecf" readonly="false"/>
<library name="http" location="..\..\..\library\network\protocol\http\http.ecf" readonly="false"/> <library name="http" location="..\..\..\library\network\protocol\http\http.ecf" readonly="false"/>
<library name="openid" location="..\..\..\library\security\openid\consumer\openid.ecf" /> <library name="openid" location="..\..\..\library\security\openid\consumer\openid.ecf" />
<library name="process" location="$ISE_LIBRARY\library\process\process.ecf"/> <library name="process" location="$ISE_LIBRARY\library\process\process.ecf"/>

View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="css" uuid="1A3423E5-9B5B-431D-A8C3-1CF638F74B6F" library_target="css">
<target name="css">
<root all_classes="true"/>
<file_rule>
<exclude>/.git$</exclude>
<exclude>/EIFGENs$</exclude>
<exclude>/.svn$</exclude>
</file_rule>
<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
</option>
<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf"/>
<cluster name="src" location="." recursive="true"/>
</target>
</system>

View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="css" uuid="1A3423E5-9B5B-431D-A8C3-1CF638F74B6F" library_target="css">
<target name="css">
<root all_classes="true"/>
<file_rule>
<exclude>/.git$</exclude>
<exclude>/EIFGENs$</exclude>
<exclude>/.svn$</exclude>
</file_rule>
<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
</option>
<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
<cluster name="src" location="." recursive="true"/>
</target>
</system>

View File

@@ -1,15 +1,18 @@
note note
description: "Summary description for {CMS_CSS_SELECTOR}." description: "Summary description for {CSS_SELECTOR}."
author: "" author: ""
date: "$Date$" date: "$Date$"
revision: "$Revision$" revision: "$Revision$"
class class
CMS_CSS_SELECTOR CSS_SELECTOR
create create
make_from_string make_from_string
convert
make_from_string ({READABLE_STRING_8, STRING_8, IMMUTABLE_STRING_8})
feature {NONE} -- Initialization feature {NONE} -- Initialization
make_from_string (s: READABLE_STRING_8) make_from_string (s: READABLE_STRING_8)

View File

@@ -1,11 +1,11 @@
note note
description: "Summary description for {CMS_CSS_STYLE}." description: "Summary description for {CSS_STYLE}."
date: "$Date$" date: "$Date$"
revision: "$Revision$" revision: "$Revision$"
EIS: "name=CSS reference", "protocol=URI", "src=http://www.w3schools.com/cssref/" EIS: "name=CSS reference", "protocol=URI", "src=http://www.w3schools.com/cssref/"
class class
CMS_CSS_STYLE CSS_STYLE
inherit inherit
ITERABLE [READABLE_STRING_8] ITERABLE [READABLE_STRING_8]
@@ -16,7 +16,7 @@ create
make_with_items make_with_items
convert convert
make_with_string ({READABLE_STRING_8, STRING_8}) make_with_string ({READABLE_STRING_8, STRING_8, IMMUTABLE_STRING_8})
feature {NONE} -- Initialization feature {NONE} -- Initialization
@@ -58,7 +58,7 @@ feature -- Access
feature -- Element change feature -- Element change
plus alias "+" (a_other: CMS_CSS_STYLE): like Current plus alias "+" (a_other: CSS_STYLE): like Current
-- <Precursor> -- <Precursor>
local local
lst: ARRAYED_LIST [READABLE_STRING_8] lst: ARRAYED_LIST [READABLE_STRING_8]
@@ -73,7 +73,7 @@ feature -- Element change
create Result.make_with_items (lst) create Result.make_with_items (lst)
end end
append (a_other: CMS_CSS_STYLE) append (a_other: CSS_STYLE)
-- Append style from `a_other' into Current -- Append style from `a_other' into Current
do do
across across

View File

@@ -1,11 +1,11 @@
note note
description: "Summary description for {CMS_CSS}." description: "Summary description for {CSS_TEXT}."
author: "" author: ""
date: "$Date$" date: "$Date$"
revision: "$Revision$" revision: "$Revision$"
class class
CMS_CSS CSS_TEXT
create create
make make
@@ -19,11 +19,21 @@ feature {NONE} -- Initialization
feature -- Access feature -- Access
items: ARRAYED_LIST [TUPLE [selectors: ITERABLE [CMS_CSS_SELECTOR]; style: CMS_CSS_STYLE]] items: ARRAYED_LIST [TUPLE [selectors: ITERABLE [CSS_SELECTOR]; style: CSS_STYLE]]
add_selector_style (a_selector: CSS_SELECTOR; a_style: CSS_STYLE)
do
items.force ([<<a_selector>>, a_style])
end
add_selectors_style (a_selectors: ITERABLE [CSS_SELECTOR]; a_style: CSS_STYLE)
do
items.force ([a_selectors, a_style])
end
feature -- Conversion feature -- Conversion
string: READABLE_STRING_8 string: STRING_8
local local
s: STRING_8 s: STRING_8
do do