amalgame/commit
NEW: common amalgame(app) body template for all app main pages
author | Jacco van Ossenbruggen |
---|---|
Fri Jul 18 13:05:24 2014 +0200 | |
committer | Jacco van Ossenbruggen |
Fri Jul 18 13:05:24 2014 +0200 | |
commit | a4d4a38f0bd232b7fa8b9d1eae6ffdc8fb482591 |
tree | b7c033eebf80b88a3b1a958eb7affded2b23fd36 |
parent | 234e3c5dfe0de6142cbd0ee84ea8a1f08916299a |
Diff style: patch stat
diff --git a/applications/analyser.pl b/applications/analyser.pl index 7c9e37b..4fc1a2f 100644 --- a/applications/analyser.pl +++ b/applications/analyser.pl @@ -40,21 +40,14 @@ http_ag_analyse(Request) :- html_page(Alignment, Mapping). html_page(Alignment, Mapping) :- - reply_html_page(equalizer(main), + reply_html_page(amalgame(app), [ title(['Align vocabularies']) ], - [ - \yui3_combo(yui3, - ['cssreset/reset-min.css', - 'cssgrids/grids-min.css', - 'cssfonts/fonts-min.css' - ]), - \html_requires(css('eq.css')), - \html_requires(css('analyser.css')), - \html_ag_header([active(http_ag_analyse), - strategy(Alignment), - focus(Mapping) - ]), + [ \html_requires(css('analyser.css')), + \html_ag_header([active(http_ag_analyse), + strategy(Alignment), + focus(Mapping) + ]), div(class('yui3-skin-sam yui-skin-sam'), [ div([id(main), class('yui3-g')], [ diff --git a/applications/builder.pl b/applications/builder.pl index 7b778c8..1222ff1 100644 --- a/applications/builder.pl +++ b/applications/builder.pl @@ -78,18 +78,12 @@ http_ag_build(Request) :- % application. html_page(Strategy, Focus) :- - reply_html_page(equalizer(main), + reply_html_page(amalgame(app), [ title(['Align vocabularies']) ], - [ \html_requires(css('eq.css')), - \html_requires(css('builder.css')), + [ \html_requires(css('builder.css')), \html_requires(css('skosbrowser.css')), \html_requires(css('columnbrowser.css')), - \yui3_combo(yui3, - ['cssreset/reset-min.css', - 'cssgrids/grids-min.css', - 'cssfonts/fonts-min.css' - ]), div(class('yui3-skin-sam yui-skin-sam'), [ \html_ag_header([ active(http_ag_build), diff --git a/applications/evaluater.pl b/applications/evaluater.pl index b6e3f27..ec72fb0 100644 --- a/applications/evaluater.pl +++ b/applications/evaluater.pl @@ -50,17 +50,11 @@ http_ag_evaluate(Request) :- html_page(Alignment, SelectedMapping). html_page(Alignment, Mapping) :- - reply_html_page(equalizer(main), + reply_html_page(amalgame(app), [ title(['Align vocabularies']) ], - [ \html_requires(css('eq.css')), - \html_requires(css('evaluater.css')), + [ \html_requires(css('evaluater.css')), \html_requires(css('gallery-paginator.css')), - \yui3_combo(yui3, - ['cssreset/reset-min.css', - 'cssgrids/grids-min.css', - 'cssfonts/fonts-min.css' - ]), \html_ag_header([active(http_ag_evaluate), strategy(Alignment), focus(Mapping) diff --git a/applications/publisher.pl b/applications/publisher.pl index 0195417..ebd5423 100644 --- a/applications/publisher.pl +++ b/applications/publisher.pl @@ -81,12 +81,10 @@ html_page(Alignment, Focus) :- rdf_equal(amalgame:final, DefaultStatus), supported_map_relations(MapRelations), rdf_equal(skos:closeMatch, DefaultRelationIfNoneGiven), - reply_html_page(equalizer(main), + reply_html_page(amalgame(app), [ title(['Align vocabularies']) ], - [ - \html_requires(css('eq.css')), - div(class('yui3-skin-sam yui-skin-sam'), + [ div(class('yui3-skin-sam yui-skin-sam'), [ \html_ag_header( [active(http_ag_publish_form), focus(Focus), diff --git a/config-available/ag_skin.pl b/config-available/ag_skin.pl index 4782320..4c24d6a 100644 --- a/config-available/ag_skin.pl +++ b/config-available/ag_skin.pl @@ -1,6 +1,5 @@ :- module(ag_skin, []). -:- use_module(library(http/http_dispatch)). :- use_module(library(http/html_write)). :- use_module(library(http/html_head)). @@ -10,10 +9,12 @@ :- use_module(cliopatria(hooks)). -% :- use_module(skin(cliopatria)). +:- use_module(library(yui3_beta)). +:- use_module(skin(cliopatria)). :- use_module(components(label)). % :- use_module(components(menu)). -:- use_module(components(simple_search)). +% :- use_module(components(simple_search)). + :- set_setting_default(graphviz:format, svg). @@ -64,35 +65,26 @@ cliopatria:predicate_order(P, 400) :- cliopatria:predicate_order(P, 405) :- rdf_has(P, rdfs:isDefinedBy, 'http://purl.org/vocabularies/amalgame'). -user:body(amalgame(search), Body) --> - { - http_link_to_id(http_amalgame_main_page, [], BackOfficeLink) - }, - html_requires(cliopatria), - html(body(class(['yui-skin-sam', ag_search, cliopatria]), - [ - div(class(ag_search), - [ - \simple_search_form, - div(class(content), Body) - ]), - br(clear(all)), - div(class(footer), - \(cliopatria:server_address) - ), - div([class(backoffice)], - [a(href(BackOfficeLink), 'back office') - ]) - ])). - % Amalgame is an extension of ClioPatria and uses the ClioPatria % skin. :- multifile user:body//2. -user:body(user(Style), Body) --> - user:body(cliopatria(Style), Body). +user:body(amalgame(app), Body) --> + html([ \html_requires(cliopatria), + \html_requires(css('application.css')), + \yui3_combo(yui3, + ['cssreset/reset-min.css', + 'cssgrids/grids-min.css', + 'cssfonts/fonts-min.css' + ]), + + body(class(['yui-skin-sam', cliopatria]), + [ Body + ]), + \server_address(amalgame) + ]). format_xsd_timestamp(L) --> { diff --git a/web/css/amalgame.css b/web/css/amalgame.css new file mode 100644 index 0000000..23b0fe1 --- /dev/null +++ b/web/css/amalgame.css @@ -0,0 +1 @@ +/* General purpose amalgame style */ diff --git a/web/css/eq.css b/web/css/application.css similarity index 100% rename from web/css/eq.css rename to web/css/application.css