You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/05/14 16:43:23 UTC
[1/2] isis git commit: ISIS-1579: adds the doc being referenced in
the search results
Repository: isis
Updated Branches:
refs/heads/master de83e6eda -> 34902089c
ISIS-1579: adds the doc being referenced in the search results
Also reference javadoc.io in the menu bar
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2db1920b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2db1920b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2db1920b
Branch: refs/heads/master
Commit: 2db1920b507b5bfb63b332f87f1bc59d218522fa
Parents: de83e6e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun May 14 15:42:31 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun May 14 15:42:31 2017 +0100
----------------------------------------------------------------------
.../main/asciidoc/css/search-panel/search-panel.css | 5 +++++
adocs/documentation/src/main/asciidoc/index.html | 3 +++
.../src/main/asciidoc/js/search-panel/search-panel.js | 14 +++++++++++++-
adocs/template/document.html.erb | 4 ++++
4 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2db1920b/adocs/documentation/src/main/asciidoc/css/search-panel/search-panel.css
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/css/search-panel/search-panel.css b/adocs/documentation/src/main/asciidoc/css/search-panel/search-panel.css
index b0d9ef2..bf3d146 100644
--- a/adocs/documentation/src/main/asciidoc/css/search-panel/search-panel.css
+++ b/adocs/documentation/src/main/asciidoc/css/search-panel/search-panel.css
@@ -8,6 +8,11 @@
color: #D5810A;
}
+.searchUrl {
+ font-size: 12px;
+ color: #D5810A;
+ }
+
.searchDescription {
margin-top: 0px;
margin-bottom: 0px;
http://git-wip-us.apache.org/repos/asf/isis/blob/2db1920b/adocs/documentation/src/main/asciidoc/index.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/index.html b/adocs/documentation/src/main/asciidoc/index.html
index 84d19ac..a25216d 100644
--- a/adocs/documentation/src/main/asciidoc/index.html
+++ b/adocs/documentation/src/main/asciidoc/index.html
@@ -195,6 +195,9 @@ table.CodeRay td.code>pre{padding:0}
<li><a href="guides/rgcms/rgcms.html">Classes, Methods and Schema</a></li>
<li><a href="guides/rgmvn/rgmvn.html">Maven plugin</a></li>
<li><a href="guides/rgfis/rgfis.html">Framework Internal Services</a></li>
+ <li role="separator" class="divider"></li>
+ <li class="dropdown-header">Javadoc</li>
+ <li><a href="http://javadoc.io/doc/org.apache.isis.core/isis-core-applib">Applib</a></li>
</ul> </li>
<li class="dropdown hidden-sm hidden-md"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Downloads<span class="caret"></span></a>
<ul class="dropdown-menu">
http://git-wip-us.apache.org/repos/asf/isis/blob/2db1920b/adocs/documentation/src/main/asciidoc/js/search-panel/search-panel.js
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/js/search-panel/search-panel.js b/adocs/documentation/src/main/asciidoc/js/search-panel/search-panel.js
index 092e678..feea49a 100644
--- a/adocs/documentation/src/main/asciidoc/js/search-panel/search-panel.js
+++ b/adocs/documentation/src/main/asciidoc/js/search-panel/search-panel.js
@@ -42,7 +42,19 @@ $('#search-form').submit(function(ev) {
var percentScore = score.toFixed(2);
if(description) {
- $('#search-results').append("<br/><span class='searchLink'><a href='" + url + "'>" + title + " <span class='searchScore'>" + percentScore + "</span>" + "</a></span><p class='searchDescription'>" + description + "</p>");
+ var urlAfterSlash = /[^/]*$/.exec(url)[0];
+ var urlNoAnchor = urlAfterSlash.split("#")[0];
+ $('#search-results').append(
+ "<br/>" +
+ "<span class='searchLink'>" +
+ "<a href='" + url + "'>" +
+ title +
+ " <span class='searchUrl'>" + urlNoAnchor + "</span>" +
+ " <span class='searchScore'>(" + percentScore + ")</span>" +
+ "</a>" +
+ "</span>" +
+ "<p class='searchDescription'>" + description + "</p>"
+ );
}
};
}
http://git-wip-us.apache.org/repos/asf/isis/blob/2db1920b/adocs/template/document.html.erb
----------------------------------------------------------------------
diff --git a/adocs/template/document.html.erb b/adocs/template/document.html.erb
index 5e44daf..d879f0f 100644
--- a/adocs/template/document.html.erb
+++ b/adocs/template/document.html.erb
@@ -129,6 +129,10 @@
<li><a href="<%= (attr :_basedir) %>./guides/rgmvn/rgmvn.html">Maven plugin</a></li>
<li><a href="<%= (attr :_basedir) %>./guides/rgfis/rgfis.html">Framework Internal Services</a></li>
+ <li role="separator" class="divider"></li>
+ <li class="dropdown-header">Javadoc</li>
+ <li><a href="http://javadoc.io/doc/org.apache.isis.core/isis-core-applib">Applib</a></li>
+
</ul>
</li>
[2/2] isis git commit: ISIS-1520: no need to explicitly exclude
amelia (wicket bootstrap has been updated in other wicket7 tickets)
Posted by da...@apache.org.
ISIS-1520: no need to explicitly exclude amelia (wicket bootstrap has been updated in other wicket7 tickets)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/34902089
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/34902089
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/34902089
Branch: refs/heads/master
Commit: 34902089c725441a593b0bb56fc01ebb04662b5c
Parents: 2db1920
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun May 14 17:43:10 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun May 14 17:43:10 2017 +0100
----------------------------------------------------------------------
.../webapp/src/main/webapp/WEB-INF/viewer_wicket.properties | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/34902089/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index 44fb49e..10096cd 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -112,8 +112,6 @@ isis.viewer.wicket.themes.showChooser=true
#
#isis.viewer.wicket.themes.enabled=bootstrap-theme,Cosmo,Flatly,Darkly,Sandstone,United
-# ISIS-1520 Temporarily disable the broken Amelia theme and list all other themes
-isis.viewer.wicket.themes.enabled=bootstrap-theme, Cerulean, Cosmo, Cyborg, Darkly, Flatly, Journal, Lumen, Paper, Readable, Sandstone, Simplex, Slate, Spacelab, Superhero, United, Yeti
#
# whether to automatically select dependent choice when the choice it depends upon changes.