[valadoc/wip/beniofel/new-style: 10/10] move images into subdir



commit babd36baf6a49f638df06729116c5632316da8b3
Author: Ben Iofel <iofelben gmail com>
Date:   Wed Mar 30 20:25:43 2016 -0400

    move images into subdir

 src/doclets/html2/doclet.vala                |    8 +-
 web-assets/Makefile.am                       |   58 ++++++++--------
 web-assets/{ => images}/abstractclass.svg    |    0
 web-assets/{ => images}/abstractmethod.svg   |    0
 web-assets/{ => images}/abstractproperty.svg |    0
 web-assets/{ => images}/class.svg            |    0
 web-assets/{ => images}/coll_close.png       |  Bin 185 -> 185 bytes
 web-assets/{ => images}/coll_close.svg       |    0
 web-assets/{ => images}/coll_open.png        |  Bin 204 -> 204 bytes
 web-assets/{ => images}/coll_open.svg        |    0
 web-assets/{ => images}/constant.svg         |    0
 web-assets/{ => images}/constructor.svg      |    0
 web-assets/{ => images}/delegate.svg         |    0
 web-assets/{ => images}/enum.svg             |    0
 web-assets/{ => images}/enumvalue.svg        |    0
 web-assets/{ => images}/errorcode.svg        |    0
 web-assets/{ => images}/errordomain.svg      |    0
 web-assets/{ => images}/field.svg            |    0
 web-assets/{ => images}/interface.svg        |    0
 web-assets/{ => images}/method.svg           |    0
 web-assets/{ => images}/namespace.svg        |    0
 web-assets/{ => images}/package.svg          |    0
 web-assets/{ => images}/packages.svg         |    0
 web-assets/{ => images}/property.svg         |    0
 web-assets/{ => images}/signal.svg           |    0
 web-assets/{ => images}/staticmethod.svg     |    0
 web-assets/{ => images}/struct.svg           |    0
 web-assets/{ => images}/tip.svg              |    0
 web-assets/{ => images}/virtualmethod.svg    |    0
 web-assets/{ => images}/virtualproperty.svg  |    0
 web-assets/{ => images}/warning.svg          |    0
 web-assets/{scripts.js => script.js}         |    0
 web-assets/style.css                         |   92 +++++++++++++-------------
 33 files changed, 79 insertions(+), 79 deletions(-)
---
diff --git a/src/doclets/html2/doclet.vala b/src/doclets/html2/doclet.vala
index 1eafa56..33593e4 100644
--- a/src/doclets/html2/doclet.vala
+++ b/src/doclets/html2/doclet.vala
@@ -35,9 +35,9 @@ public class Valadoc.Html.Doclet : Valadoc.Html.BasicDoclet {
        private const string css_path = "../style.css";
 
 
-       private const string js_path_package = "scripts.js";
-       private const string js_path_wiki = "../scripts.js";
-       private const string js_path = "../scripts.js";
+       private const string js_path_package = "script.js";
+       private const string js_path_wiki = "../script.js";
+       private const string js_path = "../script.js";
 
        private class IndexLinkHelper : LinkHelper {
                protected override string? from_wiki_to_package (WikiPage from, Api.Package to) {
@@ -74,7 +74,7 @@ public class Valadoc.Html.Doclet : Valadoc.Html.BasicDoclet {
        }
 
        protected virtual string get_icon_directory () {
-               return ".."; // ../images
+               return "../images";
        }
 
        public override void process (Settings settings, Api.Tree tree, ErrorReporter reporter) {
diff --git a/web-assets/Makefile.am b/web-assets/Makefile.am
index 303b253..bd75e2e 100644
--- a/web-assets/Makefile.am
+++ b/web-assets/Makefile.am
@@ -2,34 +2,34 @@ NULL =
 
 iconsdir = $(datadir)/valadoc/web-assets
 
-dist_icons_DATA = \
+nobase_icons_DATA = \
        style.css \
-       scripts.js \
-       abstractclass.svg \
-       abstractmethod.svg \
-       abstractproperty.svg \
-       class.svg \
-       coll_close.png \
-       coll_open.png \
-       constant.svg \
-       constructor.svg \
-       delegate.svg \
-       enum.svg \
-       enumvalue.svg \
-       errorcode.svg \
-       errordomain.svg \
-       field.svg \
-       interface.svg \
-       method.svg \
-       namespace.svg \
-       package.svg \
-       packages.svg \
-       property.svg \
-       signal.svg \
-       staticmethod.svg \
-       struct.svg \
-       tip.svg \
-       virtualmethod.svg \
-       virtualproperty.svg \
-       warning.svg \
+       script.js \
+       images/abstractclass.svg \
+       images/abstractmethod.svg \
+       images/abstractproperty.svg \
+       images/class.svg \
+       images/coll_close.png \
+       images/coll_open.png \
+       images/constant.svg \
+       images/constructor.svg \
+       images/delegate.svg \
+       images/enum.svg \
+       images/enumvalue.svg \
+       images/errorcode.svg \
+       images/errordomain.svg \
+       images/field.svg \
+       images/interface.svg \
+       images/method.svg \
+       images/namespace.svg \
+       images/package.svg \
+       images/packages.svg \
+       images/property.svg \
+       images/signal.svg \
+       images/staticmethod.svg \
+       images/struct.svg \
+       images/tip.svg \
+       images/virtualmethod.svg \
+       images/virtualproperty.svg \
+       images/warning.svg \
        $(NULL)
diff --git a/web-assets/abstractclass.svg b/web-assets/images/abstractclass.svg
similarity index 100%
rename from web-assets/abstractclass.svg
rename to web-assets/images/abstractclass.svg
diff --git a/web-assets/abstractmethod.svg b/web-assets/images/abstractmethod.svg
similarity index 100%
rename from web-assets/abstractmethod.svg
rename to web-assets/images/abstractmethod.svg
diff --git a/web-assets/abstractproperty.svg b/web-assets/images/abstractproperty.svg
similarity index 100%
rename from web-assets/abstractproperty.svg
rename to web-assets/images/abstractproperty.svg
diff --git a/web-assets/class.svg b/web-assets/images/class.svg
similarity index 100%
rename from web-assets/class.svg
rename to web-assets/images/class.svg
diff --git a/web-assets/coll_close.svg b/web-assets/images/coll_close.svg
similarity index 100%
rename from web-assets/coll_close.svg
rename to web-assets/images/coll_close.svg
diff --git a/web-assets/coll_open.svg b/web-assets/images/coll_open.svg
similarity index 100%
rename from web-assets/coll_open.svg
rename to web-assets/images/coll_open.svg
diff --git a/web-assets/constant.svg b/web-assets/images/constant.svg
similarity index 100%
rename from web-assets/constant.svg
rename to web-assets/images/constant.svg
diff --git a/web-assets/constructor.svg b/web-assets/images/constructor.svg
similarity index 100%
rename from web-assets/constructor.svg
rename to web-assets/images/constructor.svg
diff --git a/web-assets/delegate.svg b/web-assets/images/delegate.svg
similarity index 100%
rename from web-assets/delegate.svg
rename to web-assets/images/delegate.svg
diff --git a/web-assets/enum.svg b/web-assets/images/enum.svg
similarity index 100%
rename from web-assets/enum.svg
rename to web-assets/images/enum.svg
diff --git a/web-assets/enumvalue.svg b/web-assets/images/enumvalue.svg
similarity index 100%
rename from web-assets/enumvalue.svg
rename to web-assets/images/enumvalue.svg
diff --git a/web-assets/errorcode.svg b/web-assets/images/errorcode.svg
similarity index 100%
rename from web-assets/errorcode.svg
rename to web-assets/images/errorcode.svg
diff --git a/web-assets/errordomain.svg b/web-assets/images/errordomain.svg
similarity index 100%
rename from web-assets/errordomain.svg
rename to web-assets/images/errordomain.svg
diff --git a/web-assets/field.svg b/web-assets/images/field.svg
similarity index 100%
rename from web-assets/field.svg
rename to web-assets/images/field.svg
diff --git a/web-assets/interface.svg b/web-assets/images/interface.svg
similarity index 100%
rename from web-assets/interface.svg
rename to web-assets/images/interface.svg
diff --git a/web-assets/method.svg b/web-assets/images/method.svg
similarity index 100%
rename from web-assets/method.svg
rename to web-assets/images/method.svg
diff --git a/web-assets/namespace.svg b/web-assets/images/namespace.svg
similarity index 100%
rename from web-assets/namespace.svg
rename to web-assets/images/namespace.svg
diff --git a/web-assets/package.svg b/web-assets/images/package.svg
similarity index 100%
rename from web-assets/package.svg
rename to web-assets/images/package.svg
diff --git a/web-assets/packages.svg b/web-assets/images/packages.svg
similarity index 100%
rename from web-assets/packages.svg
rename to web-assets/images/packages.svg
diff --git a/web-assets/property.svg b/web-assets/images/property.svg
similarity index 100%
rename from web-assets/property.svg
rename to web-assets/images/property.svg
diff --git a/web-assets/signal.svg b/web-assets/images/signal.svg
similarity index 100%
rename from web-assets/signal.svg
rename to web-assets/images/signal.svg
diff --git a/web-assets/staticmethod.svg b/web-assets/images/staticmethod.svg
similarity index 100%
rename from web-assets/staticmethod.svg
rename to web-assets/images/staticmethod.svg
diff --git a/web-assets/struct.svg b/web-assets/images/struct.svg
similarity index 100%
rename from web-assets/struct.svg
rename to web-assets/images/struct.svg
diff --git a/web-assets/tip.svg b/web-assets/images/tip.svg
similarity index 100%
rename from web-assets/tip.svg
rename to web-assets/images/tip.svg
diff --git a/web-assets/virtualmethod.svg b/web-assets/images/virtualmethod.svg
similarity index 100%
rename from web-assets/virtualmethod.svg
rename to web-assets/images/virtualmethod.svg
diff --git a/web-assets/virtualproperty.svg b/web-assets/images/virtualproperty.svg
similarity index 100%
rename from web-assets/virtualproperty.svg
rename to web-assets/images/virtualproperty.svg
diff --git a/web-assets/warning.svg b/web-assets/images/warning.svg
similarity index 100%
rename from web-assets/warning.svg
rename to web-assets/images/warning.svg
diff --git a/web-assets/scripts.js b/web-assets/script.js
similarity index 100%
rename from web-assets/scripts.js
rename to web-assets/script.js
diff --git a/web-assets/style.css b/web-assets/style.css
index d2ce5f3..d8db625 100644
--- a/web-assets/style.css
+++ b/web-assets/style.css
@@ -33,7 +33,7 @@ ul.external_link {
        min-height: 48px;
        background-position: 6px 0.5em;
        background-repeat: no-repeat;
-       background-image: url(warning.svg);
+       background-image: url(images/warning.svg);
 }
 
 .main_table {
@@ -223,7 +223,7 @@ div.main_notification_block {
 }
 
 span.main_block_headline {
-       background-image:url(tip.svg);
+       background-image:url(images/tip.svg);
        background-repeat:no-repeat;
        background-position:center right;
        font-weight:bold;
@@ -292,7 +292,7 @@ h3.main_title {
 
 
 .description a.constant, .brief_description a.constant {
-       background-image:url(constant.svg);
+       background-image:url(images/constant.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -300,7 +300,7 @@ h3.main_title {
        border:0px;
 }
 .description a.namespace, .brief_description a.namespace {
-       background-image:url(namespace.svg);
+       background-image:url(images/namespace.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -308,7 +308,7 @@ h3.main_title {
        border:0px;
 }
 .description a.struct, .brief_description a.struct {
-       background-image:url(struct.svg);
+       background-image:url(images/struct.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -316,7 +316,7 @@ h3.main_title {
        border:0px;
 }
 .description a.interface, .brief_description a.interface {
-       background-image:url(interface.svg);
+       background-image:url(images/interface.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -324,7 +324,7 @@ h3.main_title {
        border:0px;
 }
 .description a.enum, .brief_description a.enum {
-       background-image:url(enum.svg);
+       background-image:url(images/enum.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -332,7 +332,7 @@ h3.main_title {
        border:0px;
 }
 .description a.errordomain, .brief_description a.errordomain {
-       background-image:url(errordomain.svg);
+       background-image:url(images/errordomain.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -340,7 +340,7 @@ h3.main_title {
        border:0px;
 }
 .description a.delegate, .brief_description a.delegate {
-       background-image:url(delegate.svg);
+       background-image:url(images/delegate.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -348,7 +348,7 @@ h3.main_title {
        border:0px;
 }
 .description a.signal, .brief_description a.signal {
-       background-image:url(signal.svg);
+       background-image:url(images/signal.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -356,7 +356,7 @@ h3.main_title {
        border:0px;
 }
 .description a.field, .brief_description a.field {
-       background-image:url(field.svg);
+       background-image:url(images/field.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -364,7 +364,7 @@ h3.main_title {
        border:0px;
 }
 .description a.enumvalue, .brief_description a.enumvalue {
-       background-image:url(enumvalue.svg);
+       background-image:url(images/enumvalue.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -372,7 +372,7 @@ h3.main_title {
        border:0px;
 }
 .description a.errorcode, .brief_description a.errorcode {
-       background-image:url(errorcode.svg);
+       background-image:url(images/errorcode.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -380,7 +380,7 @@ h3.main_title {
        border:0px;
 }
 .description a.class, .brief_description a.class {
-       background-image:url(class.svg);
+       background-image:url(images/class.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -388,7 +388,7 @@ h3.main_title {
        border:0px;
 }
 a.abstract_class, .description a.abstract_class, .brief_description a.abstract_class {
-       background-image:url(abstractclass.svg);
+       background-image:url(images/abstractclass.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -397,7 +397,7 @@ a.abstract_class, .description a.abstract_class, .brief_description a.abstract_c
        font-style: italic;
 }
 .description a.property, .brief_description a.property {
-       background-image:url(property.svg);
+       background-image:url(images/property.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -405,7 +405,7 @@ a.abstract_class, .description a.abstract_class, .brief_description a.abstract_c
        border:0px;
 }
 .description a.virtual_property, .brief_description a.virtual_property {
-       background-image:url(virtualproperty.svg);
+       background-image:url(images/virtualproperty.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -413,7 +413,7 @@ a.abstract_class, .description a.abstract_class, .brief_description a.abstract_c
        border:0px;
 }
 .description a.abstract_property, .brief_description a.abstract_property {
-       background-image:url(abstractproperty.svg);
+       background-image:url(images/abstractproperty.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -421,7 +421,7 @@ a.abstract_class, .description a.abstract_class, .brief_description a.abstract_c
        border:0px;
 }
 .description a.method, .brief_description a.method {
-       background-image:url(method.svg);
+       background-image:url(images/method.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -429,7 +429,7 @@ a.abstract_class, .description a.abstract_class, .brief_description a.abstract_c
        border:0px;
 }
 .description a.static_method, .brief_description a.static_method {
-       background-image:url(staticmethod.svg);
+       background-image:url(images/staticmethod.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -437,7 +437,7 @@ a.abstract_class, .description a.abstract_class, .brief_description a.abstract_c
        border:0px;
 }
 a.virtual_method, .description a.virtual_method, .brief_description a.virtual_method {
-       background-image:url(virtualmethod.svg);
+       background-image:url(images/virtualmethod.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -445,7 +445,7 @@ a.virtual_method, .description a.virtual_method, .brief_description a.virtual_me
        border:0px;
 }
 .description a.abstract_method, .brief_description a.abstract_method {
-       background-image:url(abstractmethod.svg);
+       background-image:url(images/abstractmethod.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -453,7 +453,7 @@ a.virtual_method, .description a.virtual_method, .brief_description a.virtual_me
        border:0px;
 }
 .description a.creation_method, .brief_description a.creation_method {
-       background-image:url(constructor.svg);
+       background-image:url(images/constructor.svg);
        display:inline-block;
        padding-right:17px;
        background-repeat:no-repeat;
@@ -462,73 +462,73 @@ a.virtual_method, .description a.virtual_method, .brief_description a.virtual_me
 }
 
 .navi_main .errorcode, .navi_inline .errorcode {
-       list-style-image:url(errorcode.svg);
+       list-style-image:url(images/errorcode.svg);
 }
 .navi_main .enumvalue, .navi_inline .enumvalue {
-       list-style-image:url(enumvalue.svg);
+       list-style-image:url(images/enumvalue.svg);
 }
 .navi_main .abstract_class, .navi_inline .abstract_class {
-       list-style-image: url(abstractclass.svg);
+       list-style-image: url(images/abstractclass.svg);
 }
 .navi_main .abstract_method, .navi_inline .abstract_method {
-       list-style-image: url( abstractmethod.svg );
+       list-style-image: url(images/abstractmethod.svg);
 }
 .navi_main .creation_method, .navi_inline .creation_method, .main_list_m {
-       list-style-image: url(constructor.svg);
+       list-style-image: url(images/constructor.svg);
 }
 .navi_main .static_method, .navi_inline .static_method {
-       list-style-image: url(staticmethod.svg);
+       list-style-image: url(images/staticmethod.svg);
 }
 .navi_main .package_index {
-       list-style-image: url(packages.svg);
+       list-style-image: url(images/packages.svg);
 }
 .navi_main .virtual_method, .navi_inline .virtual_method {
-       list-style-image: url(virtualmethod.svg);
+       list-style-image: url(images/virtualmethod.svg);
 }
 .navi_main .errordomain, .navi_inline .errordomain, .main_list_errdom {
-       list-style-image: url(errordomain.svg);
+       list-style-image: url(images/errordomain.svg);
 }
 .navi_main .namespace, .navi_inline .namespace, .main_list_ns {
-       list-style-image: url(namespace.svg);
+       list-style-image: url(images/namespace.svg);
 }
 .navi_main .method, .navi_inline .method {
-       list-style-image: url(method.svg);
+       list-style-image: url(images/method.svg);
 }
 .navi_main .struct, .navi_inline .struct, .main_list_stru {
-       list-style-image: url(struct.svg);
+       list-style-image: url(images/struct.svg);
 }
 .navi_main .interface, .navi_inline .interface, .main_list_iface {
-       list-style-image: url(interface.svg);
+       list-style-image: url(images/interface.svg);
 }
 .navi_main .field, .navi_inline .field, .main_list_field {
-       list-style-image: url(field.svg);
+       list-style-image: url(images/field.svg);
 }
 .navi_main .class, .navi_inline .class, .main_list_cl {
-       list-style-image: url(class.svg);
+       list-style-image: url(images/class.svg);
 }
 .navi_main .enum, .navi_inline .enum, .main_list_en {
-       list-style-image: url(enum.svg);
+       list-style-image: url(images/enum.svg);
 }
 .navi_main .property, .navi_inline .property, .main_list_prop {
-       list-style-image: url(property.svg);
+       list-style-image: url(images/property.svg);
 }
 .navi_main .abstract_property, .navi_inline .abstract_property {
-       list-style-image: url(abstractproperty.svg);
+       list-style-image: url(images/abstractproperty.svg);
 }
 .navi_main .virtual_property, .navi_inline .virtual_property {
-       list-style-image: url(virtualproperty.svg);
+       list-style-image: url(images/virtualproperty.svg);
 }
 .navi_main .delegate, .navi_inline .delegate, .main_list_del {
-       list-style-image: url(delegate.svg);
+       list-style-image: url(images/delegate.svg);
 }
 .navi_main .signal, .navi_inline .signal, .main_list_sig {
-       list-style-image: url(signal.svg);
+       list-style-image: url(images/signal.svg);
 }
 .navi_main .package, .navi_inline .package {
-       list-style-image: url(package.svg);
+       list-style-image: url(images/package.svg);
 }
 .navi_main .constant, .navi_inline .constant {
-       list-style-image: url(constant.svg);
+       list-style-image: url(images/constant.svg);
 }
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]