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 2014/11/04 01:33:59 UTC
[01/27] git commit: ISIS-537 Use event pubsub instead of global JS
functions. Tidy up jquery.isis.wicket.viewer.js (strict mode)
Repository: isis
Updated Branches:
refs/heads/master e523166f7 -> d4816a472
ISIS-537 Use event pubsub instead of global JS functions. Tidy up jquery.isis.wicket.viewer.js (strict mode)
https://trello.com/c/4zVNtcGc/69-the-todo-app-s-prototyping-go-to-docs-action-is-failing-js-issue
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7f8e4de6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7f8e4de6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7f8e4de6
Branch: refs/heads/master
Commit: 7f8e4de6074c2c83d8b59dfa1173e2fee3d6ae57
Parents: 36f6922
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Oct 28 22:06:13 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 31 10:06:24 2014 +0200
----------------------------------------------------------------------
.../ActionResultResponseHandlingStrategy.java | 4 +-
.../widgets/cssmenu/AjaxDeferredBehaviour.java | 4 +-
.../ui/pages/jquery.isis.wicket.viewer.js | 39 ++++++++++++++------
3 files changed, 31 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7f8e4de6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
index 952a7c3..9944cba 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
@@ -62,7 +62,7 @@ public enum ActionResultResponseHandlingStrategy {
RequestCycle requestCycle = component.getRequestCycle();
final String fullUrl = expanded(requestCycle, url);
- target.appendJavaScript("setTimeout(function(){isisOpenInNewTab('" + fullUrl + "')}, 100);");
+ target.appendJavaScript("setTimeout(function(){Wicket.Event.publish(Isis.Topic.OPEN_IN_NEW_TAB, '" + fullUrl + "');}, 100);");
}
};
@@ -95,4 +95,4 @@ public enum ActionResultResponseHandlingStrategy {
return urlStr;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/7f8e4de6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
index ddc2036..bc9bb2f 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/AjaxDeferredBehaviour.java
@@ -39,7 +39,7 @@ public abstract class AjaxDeferredBehaviour extends AbstractAjaxBehavior {
final RequestCycle requestCycle = deferredBehaviour.getComponent().getRequestCycle();
final UrlRenderer urlRenderer = requestCycle.getUrlRenderer();
String fullUrl = urlRenderer.renderFullUrl(parsedUrl);
- return "function(){isisOpenInNewTab('" + fullUrl + "')}";
+ return "Wicket.Event.publish(Isis.Topic.OPEN_IN_NEW_TAB, '" + fullUrl + "');";
}
},
SAME_WINDOW {
@@ -81,4 +81,4 @@ public abstract class AjaxDeferredBehaviour extends AbstractAjaxBehavior {
}
protected abstract IRequestHandler getRequestHandler();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/7f8e4de6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index 26df6cc..7c11e10 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -16,7 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(document).ready(function() {
+$(function() {
+
+ 'use strict';
+
+ if (typeof(Isis) === 'object' && typeof(Isis.openInNewTab) === 'function') {
+ return;
+ }
+
+ window.Isis = {
+ Topic: {
+ OPEN_IN_NEW_TAB: 'openInNewTab'
+ }
+ };
var isisVeilTimeoutId;
@@ -26,7 +38,8 @@ $(document).ready(function() {
isisVeilTimeoutId = null;
}
$("#veil").stop().fadeIn(1000)/*show()*/;
- }
+ };
+
var isisFadeInVeil = function(attributes, jqxhr, settings) {
// use timeouts because JQuery's delay(...) cannot be stopped.
//var activeEl = attributes.currentTarget.activeElement;
@@ -34,27 +47,29 @@ $(document).ready(function() {
$("#veil").fadeIn(750);
}, 250);
- }
- var isisHideVeil = function(attributes, jqXHR, settings) {
+ };
+
+ var isisHideVeil = function() {
if(isisVeilTimeoutId) {
clearTimeout(isisVeilTimeoutId);
isisVeilTimeoutId = null;
}
$("#veil").stop().hide();
- }
+ };
- var isisOpenInNewTab = function(url){
- var win=window.open(url, '_blank');
- if(win) { win.focus(); }
- }
+ Wicket.Event.subscribe(Isis.Topic.OPEN_IN_NEW_TAB, function(jqEvent, url) {
+ var win=window.open(url, '_blank');
+ if(win) { win.focus(); }
+ });
/* for modal dialogs */
- Wicket.Event.subscribe(Wicket.Event.Topic.AJAX_CALL_BEFORE_SEND, function(attributes, jqXHR, settings) {
+ Wicket.Event.subscribe(Wicket.Event.Topic.AJAX_CALL_BEFORE_SEND, function(jqEvent, attributes, jqXHR, settings) {
if (!$('#'+attributes.c).hasClass('noVeil')) {
isisShowVeil(attributes, jqXHR, settings);
}
});
- Wicket.Event.subscribe(Wicket.Event.Topic.AJAX_CALL_COMPLETE, function(attributes, jqXHR, settings) {
+
+ Wicket.Event.subscribe(Wicket.Event.Topic.AJAX_CALL_COMPLETE, function(jqEvent, attributes, jqXHR, status) {
isisHideVeil(attributes, jqXHR, settings);
});
@@ -67,7 +82,7 @@ $(document).ready(function() {
$('div.collectionContentsAsAjaxTablePanel > table.contents > tbody > tr.reloaded-after-concurrency-exception')
.livequery(function(){
- x=$(this);
+ var x = $(this);
$(this).animate({ "backgroundColor": "#FFF" }, 1000, "linear", function() {
$(x).css('background-color','').removeClass("reloaded-after-concurrency-exception");
});
[09/27] git commit: ISIS-537 Align the labels in label-left mode to
the start (left)
Posted by da...@apache.org.
ISIS-537 Align the labels in label-left mode to the start (left)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e92855cb
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e92855cb
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e92855cb
Branch: refs/heads/master
Commit: e92855cb38f894e768637179076524226d8da27f
Parents: 4fbe444
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Nov 1 15:24:37 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Nov 1 15:24:37 2014 +0200
----------------------------------------------------------------------
.../org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e92855cb/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index a84916c..66a2dc7 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -92,7 +92,7 @@ div.label-left label.control-label {
float: left;
padding-top: 7px;
padding-left: 10px;
- text-align: justify;
+ text-align: start;
}
div.label-top label.control-label {
[06/27] git commit: ISIS-537 Reduce the space between the label and
its Select2 input in .label-top mode
Posted by da...@apache.org.
ISIS-537 Reduce the space between the label and its Select2 input in .label-top mode
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ad971653
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ad971653
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ad971653
Branch: refs/heads/master
Commit: ad9716530efbeb41bf669361849fa8379f9715fc
Parents: b4bfb68
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 31 11:31:00 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 31 11:31:00 2014 +0200
----------------------------------------------------------------------
.../components/widgets/valuechoices/ValueChoicesSelect2Panel.css | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ad971653/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css
index d9b968a..9f1612a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.css
@@ -17,6 +17,3 @@
* under the License.
*/
-.valueChoicesSelect2Panel .choicesPlaceholder .select2-container.choices {
- float: right;
-}
[13/27] git commit: ISIS-537 Use disabled="disabled" in
CollectionContentsAsSummary instead of disabled="true" to be HTML valid
Posted by da...@apache.org.
ISIS-537 Use disabled="disabled" in CollectionContentsAsSummary instead of disabled="true" to be HTML valid
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/430273c8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/430273c8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/430273c8
Branch: refs/heads/master
Commit: 430273c89a6848508f94e79593f9ec9a8987b822
Parents: f2993a0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Nov 1 15:27:34 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Nov 1 15:27:34 2014 +0200
----------------------------------------------------------------------
.../summary/CollectionContentsAsSummary.html | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/430273c8/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html
index 7d4770d..1f55751 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.html
@@ -31,10 +31,10 @@
<td class="aggregatesCell">
<table class="table table-condensed" style="background-color: inherit; margin-bottom: 0">
<tr>
- <td class="aggregateName">Sum:</td><td><input class="numberValue form-control" type="text" disabled="true" wicket:id="sum"/></td>
- <td class="aggregateName">Avg:</td><td><input class="numberValue form-control" type="text" disabled="true" wicket:id="avg"/></td>
- <td class="aggregateName">Min:</td><td><input class="numberValue form-control" type="text" disabled="true" wicket:id="min"/></td>
- <td class="aggregateName">Max:</td><td><input class="numberValue form-control" type="text" disabled="true" wicket:id="max"/></td>
+ <td class="aggregateName">Sum:</td><td><input class="numberValue form-control" type="text" disabled="disabled" wicket:id="sum"/></td>
+ <td class="aggregateName">Avg:</td><td><input class="numberValue form-control" type="text" disabled="disabled" wicket:id="avg"/></td>
+ <td class="aggregateName">Min:</td><td><input class="numberValue form-control" type="text" disabled="disabled" wicket:id="min"/></td>
+ <td class="aggregateName">Max:</td><td><input class="numberValue form-control" type="text" disabled="disabled" wicket:id="max"/></td>
</tr>
</table>
</td>
[22/27] git commit: ISIS-537 Mark the body of the standalone
collection as "panel-body". This adds padding of 15px for all sides
Posted by da...@apache.org.
ISIS-537 Mark the body of the standalone collection as "panel-body". This adds padding of 15px for all sides
https://trello.com/c/ly2VsgGA/79-layout-of-the-standalone-collection-not-the-same-as-parented-collection
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7466e7cf
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7466e7cf
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7466e7cf
Branch: refs/heads/master
Commit: 7466e7cf70075c956dc0c7166c0191f91caab81b
Parents: 4bbe17e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Nov 2 22:04:20 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Nov 2 22:04:20 2014 +0200
----------------------------------------------------------------------
.../components/standalonecollection/StandaloneCollectionPanel.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7466e7cf/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
index 78632c6..e664e3a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
@@ -28,7 +28,7 @@
<div class="iconAndTitle panel-heading actionPanelHeaderNew">
<div wicket:id="actionName" class="actionName panel-title">[action name]</div>
</div>
- <div wicket:id="collectionContents"></div>
+ <div wicket:id="collectionContents" class="panel-body"></div>
</div>
</wicket:panel>
</body>
[11/27] git commit: ISIS-537 Optimize imports
Posted by da...@apache.org.
ISIS-537 Optimize imports
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5dbc13fd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5dbc13fd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5dbc13fd
Branch: refs/heads/master
Commit: 5dbc13fd2228221b14680f35396d976840d68bf5
Parents: da0ad75
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Nov 1 15:26:31 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Nov 1 15:26:31 2014 +0200
----------------------------------------------------------------------
.../isis/viewer/wicket/model/models/EntityCollectionModel.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5dbc13fd/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index 3e3c436..41c831b 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import com.google.common.base.Ascii;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -48,8 +47,6 @@ import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
import org.apache.isis.viewer.wicket.model.mementos.CollectionMemento;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.model.util.MementoFunctions;
-import org.apache.isis.viewer.wicket.model.util.ObjectAdapterFunctions;
/**
* Model representing a collection of entities, either {@link Type#STANDALONE
[16/27] git commit: ISIS-537 Disable the application action link if
the action is disabled. Use a Bootstrap tooltip to show the reason
Posted by da...@apache.org.
ISIS-537 Disable the application action link if the action is disabled. Use a Bootstrap tooltip to show the reason
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1f40aa95
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1f40aa95
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1f40aa95
Branch: refs/heads/master
Commit: 1f40aa95694072a7e240df4336eaa71323a38021
Parents: 82405a9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Nov 1 23:55:51 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Nov 1 23:55:51 2014 +0200
----------------------------------------------------------------------
.../ui/components/widgets/cssmenu/ApplicationActionsPanel.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1f40aa95/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
index 1595399..fa6f4be 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
@@ -1,6 +1,7 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameAppender;
+import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipBehavior;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.button.DropdownAutoOpenJavaScriptReference;
import java.util.List;
@@ -15,6 +16,7 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
@@ -111,6 +113,9 @@ public class ApplicationActionsPanel extends Panel {
if (!menuItem.isEnabled()) {
listItem.add(new CssClassNameAppender("disabled"));
+ subMenuItemLink.setEnabled(false);
+ TooltipBehavior tooltipBehavior = new TooltipBehavior(Model.of(menuItem.getDisabledReason()));
+ listItem.add(tooltipBehavior);
}
if (menuItem.isPrototyping()) {
subMenuItemLink.add(new CssClassNameAppender("btn btn-warning"));
[23/27] git commit: ISIS-537 Add logic to be able to contribute CSS
rules overriding Bootstrap theme's ones for the currently active theme
Posted by da...@apache.org.
ISIS-537 Add logic to be able to contribute CSS rules overriding Bootstrap theme's ones for the currently active theme
https://trello.com/c/fQCoQ47M/85-workaround-required-for-darkly-theme-with-datepicker
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3680adf0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3680adf0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3680adf0
Branch: refs/heads/master
Commit: 3680adf0aee9f4770b6c94bd218280d20f5cf1ed
Parents: 7466e7c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Nov 2 22:22:50 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Nov 2 22:22:50 2014 +0200
----------------------------------------------------------------------
.../viewer/wicket/ui/pages/PageAbstract.java | 24 ++++++++++++++++++++
.../ui/pages/bootstrap-overrides-darkly.css | 23 +++++++++++++++++++
2 files changed, 47 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3680adf0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 8ace237..8c94106 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -19,12 +19,16 @@
package org.apache.isis.viewer.wicket.ui.pages;
+import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.markup.html.references.BootlintJavaScriptReference;
+import de.agilecoders.wicket.core.settings.IBootstrapSettings;
+import de.agilecoders.wicket.core.settings.ITheme;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeCssReference;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.apache.wicket.MarkupContainer;
@@ -45,7 +49,10 @@ import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.PackageResource;
+import org.apache.wicket.request.resource.ResourceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
@@ -240,6 +247,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(getApplication().getJavaScriptLibrarySettings().getJQueryReference())));
response.render(CssHeaderItem.forReference(FontAwesomeCssReference.instance()));
response.render(CssHeaderItem.forReference(new BootstrapOverridesCssResourceReference()));
+ contributeThemeSpecificOverrides(response);
PanelUtil.renderHead(response, PageAbstract.class);
response.render(JavaScriptReferenceHeaderItem.forReference(JQUERY_LIVEQUERY_JS));
@@ -264,6 +272,22 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
}
}
+ /**
+ * Contributes theme specific Bootstrap CSS overrides if there is such resource
+ *
+ * @param response The header response to contribute to
+ */
+ private void contributeThemeSpecificOverrides(IHeaderResponse response) {
+ IBootstrapSettings bootstrapSettings = Bootstrap.getSettings(getApplication());
+ ITheme activeTheme = bootstrapSettings.getActiveThemeProvider().getActiveTheme();
+ String name = activeTheme.name().toLowerCase(Locale.ENGLISH);
+ String themeSpecificOverride = "bootstrap-overrides-" + name + ".css";
+ ResourceReference.Key themeSpecificOverrideKey = new ResourceReference.Key(PageAbstract.class.getName(), themeSpecificOverride, null, null, null);
+ if (PackageResource.exists(themeSpecificOverrideKey)) {
+ response.render(CssHeaderItem.forReference(new CssResourceReference(themeSpecificOverrideKey)));
+ }
+ }
+
private void addUserName(MarkupContainer themeDiv) {
Label userName = new Label("userName", getAuthenticationSession().getUserName());
themeDiv.add(userName);
http://git-wip-us.apache.org/repos/asf/isis/blob/3680adf0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
new file mode 100644
index 0000000..dae7b57
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.bootstrap-datetimepicker-widget {
+ background-color: #ffffff;
+ color: #000000;
+}
[18/27] git commit: ISIS-537 'use strict' for slide-panel.js to make
it more "typesafe"
Posted by da...@apache.org.
ISIS-537 'use strict' for slide-panel.js to make it more "typesafe"
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a62076ca
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a62076ca
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a62076ca
Branch: refs/heads/master
Commit: a62076cabb056b4bdd90591b5c3ef56d1f0bc1c0
Parents: b635865
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Nov 2 15:22:29 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Nov 2 15:22:29 2014 +0200
----------------------------------------------------------------------
.../ui/components/bookmarkedpages/slide-panel.js | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a62076ca/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
index c7289fb..ca5bbac 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
@@ -16,8 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(document).ready(function(){
-
+$(function(){
+
+ 'use strict';
+
var showBookmarks = function(){
$('#bookmarkedPagesSlidingDiv').slideDown('50');
$('.bookmarkRibbon').fadeOut(50);
@@ -37,7 +39,6 @@ $(document).ready(function(){
$('#bookmarkedPagesSlidingDiv').mouseleave(hideBookmarks);
$('body').keydown(function(e) {
-
// alt+[
if(e.which === 219 && e.altKey) {
if($('#bookmarkedPagesSlidingDiv').is(":visible")) {
@@ -45,10 +46,8 @@ $(document).ready(function(){
} else {
showBookmarks();
}
+ } else if (e.which === 27) {
+ hideBookmarksQuickly();
}
-
- if(e.which === 27) {
- hideBookmarksQuickly();
- }
- });
+ });
});
[21/27] git commit: ISIS-537 Do not re-add the ScalarPanel's
AjaxFormComponentUpdatingBehavior again and again even when rebuilding the
whole GUI for the panel
Posted by da...@apache.org.
ISIS-537 Do not re-add the ScalarPanel's AjaxFormComponentUpdatingBehavior again and again even when rebuilding the whole GUI for the panel
https://trello.com/c/DgiUR5Cj/97-improve-the-behavior-of-the-select2-components
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4bbe17e0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4bbe17e0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4bbe17e0
Branch: refs/heads/master
Commit: 4bbe17e0e024ca308149b5fb90ee018cd3c3bcdd
Parents: 7cf69d9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Nov 2 21:43:41 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Nov 2 21:43:41 2014 +0200
----------------------------------------------------------------------
.../components/scalars/ScalarPanelAbstract.java | 43 +++++++++++---------
.../widgets/select2/Select2ChoiceUtil.java | 14 -------
.../valuechoices/ValueChoicesSelect2Panel.java | 3 ++
3 files changed, 26 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4bbe17e0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 78afa72..b67814a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -238,29 +238,32 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
addCssForMetaModel();
if(!subscribers.isEmpty()) {
- addFormComponentBehavior(new AjaxFormComponentUpdatingBehavior("change"){
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- for (ScalarModelSubscriber subscriber : subscribers) {
- subscriber.onUpdate(target, ScalarPanelAbstract.this);
- }
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, RuntimeException e) {
- super.onError(target, e);
- for (ScalarModelSubscriber subscriber : subscribers) {
- subscriber.onError(target, ScalarPanelAbstract.this);
- }
-
- }
- });
+ addFormComponentBehavior(new ScalarUpdatingBehavior());
}
}
+ protected class ScalarUpdatingBehavior extends AjaxFormComponentUpdatingBehavior {
+ private static final long serialVersionUID = 1L;
+
+ private ScalarUpdatingBehavior() {
+ super("change");
+ }
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ for (ScalarModelSubscriber subscriber : subscribers) {
+ subscriber.onUpdate(target, ScalarPanelAbstract.this);
+ }
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, RuntimeException e) {
+ super.onError(target, e);
+ for (ScalarModelSubscriber subscriber : subscribers) {
+ subscriber.onError(target, ScalarPanelAbstract.this);
+ }
+ }
+ }
/**
* Mandatory hook.
http://git-wip-us.apache.org/repos/asf/isis/blob/4bbe17e0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
index ba37ef7..fb82253 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceUtil.java
@@ -18,7 +18,6 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.select2;
import com.vaynberg.wicket.select2.Select2Choice;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.model.IModel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -28,22 +27,9 @@ public final class Select2ChoiceUtil {
private Select2ChoiceUtil(){}
- // a guesstimate to convert a single character into 'em' units
- private static final double CHAR_TO_EM_MULTIPLIER = 0.8;
-
- // a further fudge, add some additional characters prior to multiplication.
- private static final int ADDITIONAL_CHARS = 3;
-
public static Select2Choice<ObjectAdapterMemento> newSelect2Choice(String id, final IModel<ObjectAdapterMemento> modelObject, ScalarModel scalarModel) {
Select2Choice<ObjectAdapterMemento> select2Choice = new Select2Choice<>(id, modelObject);
- int typicalLength = scalarModel.getTypicalLength();
- select2Choice.add(new AttributeAppender("style", asCssStyleWidth(typicalLength)));
select2Choice.setRequired(scalarModel.isRequired());
return select2Choice;
}
-
- private static String asCssStyleWidth(int numChars) {
- return "width: " + ((numChars+ADDITIONAL_CHARS) * CHAR_TO_EM_MULTIPLIER) + "em;";
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4bbe17e0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index b5a1529..e30d698 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -214,6 +214,9 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
@Override
protected void addFormComponentBehavior(Behavior behavior) {
+ for (Behavior b : select2Field.getBehaviors(ScalarUpdatingBehavior.class)) {
+ select2Field.remove(b);
+ }
select2Field.add(behavior);
}
[04/27] git commit: ISIS-537 Do not apply background effects on the
prototype application action items
Posted by da...@apache.org.
ISIS-537 Do not apply background effects on the prototype application action items
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e1b5ffe1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e1b5ffe1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e1b5ffe1
Branch: refs/heads/master
Commit: e1b5ffe1b972522e66d69878bd0dd42be2dd12b1
Parents: e14e481
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 31 11:13:41 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 31 11:13:41 2014 +0200
----------------------------------------------------------------------
.../ui/components/widgets/cssmenu/ApplicationActionsPanel.css | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e1b5ffe1/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
index b824df9..b777dcd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
@@ -81,6 +81,11 @@
min-width: 20px;
}
+.dropdown-menu > li > a.menuLink.btn-warning:hover {
+ background-color: inherit;
+ background-image: inherit;
+}
+
.dropdown-menu > li > a.menuLink.menuLinkSpacer {
padding-left: 24px;
}
[26/27] git commit: ISIS-537: moved breadcrumbs panel to footer,
and moved powered by to right.
Posted by da...@apache.org.
ISIS-537: moved breadcrumbs panel to footer, and moved powered by to right.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ce6330c3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ce6330c3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ce6330c3
Branch: refs/heads/master
Commit: ce6330c3832e204f795f50fd79b196ad7e9e41e3
Parents: 69a033e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 4 00:23:13 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 4 00:23:13 2014 +0000
----------------------------------------------------------------------
.../components/widgets/breadcrumbs/BreadcrumbPanel.css | 2 +-
.../apache/isis/viewer/wicket/ui/pages/PageAbstract.css | 5 +++++
.../apache/isis/viewer/wicket/ui/pages/PageAbstract.html | 11 ++++++-----
3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ce6330c3/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css
index ca156d9..40177b9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.css
@@ -19,6 +19,6 @@
.breadcrumbPanel {
display: inline-block;
- width: 200px;
+ width: 300px;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ce6330c3/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
index 7ad5e1f..18def10 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
@@ -23,3 +23,8 @@
font-weight:bold;
color: #c2270d;
}
+
+
+.navbar .powered-by {
+ margin-right: 0px;
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ce6330c3/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
index 5e97ba2..cdc6cf6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
@@ -45,9 +45,6 @@
<a class="navbar-brand" wicket:id="applicationName"></a>
</div>
<div class="navbar-header navbar-right">
- <form class="navbar-form navbar-left">
- <span wicket:id="breadcrumbs"></span>
- </form>
<ul class="nav navbar-nav">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -89,11 +86,15 @@
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-footer">
- <p class="navbar-text">Powered by:</p>
+ <form class="nav navbar-nav navbar-form navbar-left">
+ <span wicket:id="breadcrumbs"></span>
+ </form>
+
<ul class="nav navbar-nav">
- <li><a href="http://isis.apache.org" target="_blank">Apache Isis</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
+ <p class="navbar-text powered-by">Powered by:</p>
+ <li><a href="http://isis.apache.org" target="_blank">Apache Isis</a></li>
<li><a wicket:id="aboutLink" class="navbar-right">About</a></li>
<li wicket:id="themePicker"></li>
</ul>
[15/27] git commit: ISIS-537 Use btn-sm for Blob's Download button.
Fix the layout of the file input in .label-left mode
Posted by da...@apache.org.
ISIS-537 Use btn-sm for Blob's Download button. Fix the layout of the file input in .label-left mode
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/82405a98
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/82405a98
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/82405a98
Branch: refs/heads/master
Commit: 82405a98ae5af6c6d372627cc7bdc6133b4c5470
Parents: 61466b6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Nov 1 22:51:13 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Nov 1 22:51:13 2014 +0200
----------------------------------------------------------------------
.../scalars/isisapplib/IsisBlobOrClobPanelAbstract.html | 2 +-
.../isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/82405a98/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
index 9073598..2857d9a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
@@ -31,7 +31,7 @@
<input type="file" name="scalarValue" wicket:id="scalarValue" />
</span>
- <a class="download btn btn-xs btn-primary" wicket:id="scalarIfRegularDownload"><span class="downloadTitle">Download</span></a>
+ <a class="download btn btn-sm btn-primary" wicket:id="scalarIfRegularDownload"><span class="downloadTitle">Download</span></a>
<span class="fileName" wicket:id="fileName"></span>
</span>
<span wicket:id="feedback" class="help-block"></span>
http://git-wip-us.apache.org/repos/asf/isis/blob/82405a98/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index 66a2dc7..25dcbc1 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -121,12 +121,8 @@ div.label-left .scalarValueWrapper .form-control {
width: 100%;
}
-div.label-left .scalarValueWrapper .form-control.file-caption {
- width: 69%;
-}
-
-div.label-left .scalarValueWrapper .file-input .input-group-btn {
- display: inline;
+.file-preview-thumbnails {
+ overflow: auto;
}
div.label-left .scalarValueWrapper .input-group {
[24/27] git commit: ISIS-537 Exclude wicket-core for
wicket-bootstrap-themes dependency to make the Maven enforcer happy when
testing with a new version of Wicket
Posted by da...@apache.org.
ISIS-537 Exclude wicket-core for wicket-bootstrap-themes dependency to make the Maven enforcer happy when testing with a new version of Wicket
Tested Wicket 6.18.0 - everything looks fine !
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d9d82cc4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d9d82cc4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d9d82cc4
Branch: refs/heads/master
Commit: d9d82cc442ee66b1d3c7689f42e104dc6ec20463
Parents: 3680adf
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 3 12:13:56 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 3 12:13:56 2014 +0200
----------------------------------------------------------------------
component/viewer/wicket/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d9d82cc4/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 7f0e1c0..ff3a1f0 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -390,6 +390,12 @@
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-themes</artifactId>
<version>${wicket-bootstrap.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
[08/27] git commit: ISIS-537 Fix the alignments for .label-none
Posted by da...@apache.org.
ISIS-537 Fix the alignments for .label-none
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4fbe4447
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4fbe4447
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4fbe4447
Branch: refs/heads/master
Commit: 4fbe44479d1acd77894cf469f69882119ccbc620
Parents: 8470d51
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 31 11:43:09 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 31 11:43:09 2014 +0200
----------------------------------------------------------------------
.../wicket/ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4fbe4447/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 9f1e4b5..78afa72 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -354,7 +354,7 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
formGroup.add(new CssClassAppender("label-left"));
break;
case NONE:
- scalarName.setVisible(false);
+ formGroup.add(new CssClassAppender("label-none"));
break;
case TOP:
formGroup.add(new CssClassAppender("label-top"));
http://git-wip-us.apache.org/repos/asf/isis/blob/4fbe4447/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index 029024e..a84916c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -99,12 +99,18 @@ div.label-top label.control-label {
padding-left: 10px;
}
+div.label-none label.control-label {
+ padding-left: 10px;
+ visibility: hidden;
+}
+
div.label-left .scalarValueWrapper {
width: 70%;
float: right;
}
-div.label-top .scalarValueWrapper {
+div.label-top .scalarValueWrapper,
+div.label-none .scalarValueWrapper {
width: 99%;
display: block;
padding-left: 8px;
[25/27] git commit: ISIS-537: moved copy link to right of title
(pending use of anchorjs or similar to show only on hover), moved actions up.
Posted by da...@apache.org.
ISIS-537: moved copy link to right of title (pending use of anchorjs or similar to show only on hover), moved actions up.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/69a033e0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/69a033e0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/69a033e0
Branch: refs/heads/master
Commit: 69a033e0be299c70d699fdef9830823def0d405a
Parents: d9d82cc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 4 00:22:31 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 4 00:22:31 2014 +0000
----------------------------------------------------------------------
.../wicket/ui/components/entity/header/EntityHeaderPanel.css | 4 ++++
.../entity/icontitle/EntityIconTitleAndCopyLinkPanel.html | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/69a033e0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
index 55c9aab..2cdb440 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
@@ -28,6 +28,10 @@ div.entityHeaderPanel .iconAndTitle{
width: 100%;
}
+div.entityHeaderPanel .iconAndTitleLabel {
+ float: left;
+}
+
div.entityHeaderPanel .entityActions .cssMenuPanel .cssMenuItems:first-child {
float: left;
margin-top: 3px;
http://git-wip-us.apache.org/repos/asf/isis/blob/69a033e0/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html
index 5e7f283..18b0521 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.html
@@ -20,7 +20,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:extend>
- <span class="pull-right" wicket:id="copyLink"></span>
+ <span wicket:id="copyLink"></span>
</wicket:extend>
</body>
</html>
[05/27] git commit: ISIS-537 Show the label in label-left mode more
to the middle of its input field
Posted by da...@apache.org.
ISIS-537 Show the label in label-left mode more to the middle of its input field
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b4bfb68c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b4bfb68c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b4bfb68c
Branch: refs/heads/master
Commit: b4bfb68c5f045237498a2d87e7015a057c8ba4d0
Parents: e1b5ffe
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 31 11:29:46 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 31 11:29:46 2014 +0200
----------------------------------------------------------------------
.../org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b4bfb68c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index 799a7b9..029024e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -90,7 +90,7 @@ div.label-left.form-group {
div.label-left label.control-label {
width: 30%;
float: left;
- padding-top: 9px;
+ padding-top: 7px;
padding-left: 10px;
text-align: justify;
}
[03/27] git commit: ISIS-537 Line up the input field for .label-left
and .label-top
Posted by da...@apache.org.
ISIS-537 Line up the input field for .label-left and .label-top
https://trello.com/c/XGafV5wV/30-position-fields-either-above-or-to-left-isis-703
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e14e4818
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e14e4818
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e14e4818
Branch: refs/heads/master
Commit: e14e48188a7de6cb90afb9484628c296976e882d
Parents: 7f8e4de
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 31 10:29:24 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 31 10:29:24 2014 +0200
----------------------------------------------------------------------
.../org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e14e4818/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index feae417..799a7b9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -108,7 +108,7 @@ div.label-top .scalarValueWrapper {
width: 99%;
display: block;
padding-left: 8px;
- padding-right: 18px;
+ padding-right: 20px;
}
div.label-left .scalarValueWrapper .form-control {
[20/27] git commit: ISIS-537 Use opacity 0.5 for the veil. This is
the same opacity value as Modal's backdrop so there is no flickering when a
Modal is opened and some Ajax call is made
Posted by da...@apache.org.
ISIS-537 Use opacity 0.5 for the veil. This is the same opacity value as Modal's backdrop so there is no flickering when a Modal is opened and some Ajax call is made
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7cf69d90
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7cf69d90
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7cf69d90
Branch: refs/heads/master
Commit: 7cf69d90aac7777d8e3d38594f5f6e489c7f662d
Parents: 0b36daa
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Nov 2 21:42:38 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Nov 2 21:42:38 2014 +0200
----------------------------------------------------------------------
.../apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7cf69d90/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index 25dcbc1..5d9ef09 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -50,8 +50,8 @@
left:0;
height: 100%;
width: 100%;
- opacity: 0.4;
- filter: alpha(opacity=40);
+ opacity: 0.5;
+ filter: alpha(opacity=50);
}
.table .table td {
[10/27] git commit: ISIS-537 Remove obsolete images for the table
views selector (hide and table images)
Posted by da...@apache.org.
ISIS-537 Remove obsolete images for the table views selector (hide and table images)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/da0ad758
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/da0ad758
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/da0ad758
Branch: refs/heads/master
Commit: da0ad75850749b2df728d598dec8ae0c5df8dec2
Parents: e92855c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Nov 1 15:25:22 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Nov 1 15:25:22 2014 +0200
----------------------------------------------------------------------
.../ui/selector/links/images/icon_hide_off.png | Bin 493 -> 0 bytes
.../wicket/ui/selector/links/images/icon_hide_on.png | Bin 376 -> 0 bytes
.../ui/selector/links/images/icon_table_off.png | Bin 275 -> 0 bytes
.../ui/selector/links/images/icon_table_on.png | Bin 240 -> 0 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/da0ad758/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_off.png
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_off.png b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_off.png
deleted file mode 100644
index f5f1049..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_off.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/da0ad758/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_on.png
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_on.png b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_on.png
deleted file mode 100644
index a6057bb..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_hide_on.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/da0ad758/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_off.png
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_off.png b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_off.png
deleted file mode 100644
index 9dac676..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_off.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/da0ad758/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_on.png
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_on.png b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_on.png
deleted file mode 100644
index 1477b8c..0000000
Binary files a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/images/icon_table_on.png and /dev/null differ
[27/27] git commit: ISIS-537: use alt+] instead of ctrl+]
Posted by da...@apache.org.
ISIS-537: use alt+] instead of ctrl+]
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d4816a47
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d4816a47
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d4816a47
Branch: refs/heads/master
Commit: d4816a472a6f01f2abfabccb155c3d24fed03c08
Parents: ce6330c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 4 00:23:32 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 4 00:23:32 2014 +0000
----------------------------------------------------------------------
.../isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d4816a47/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index fa58e58..1178319 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -90,8 +90,8 @@ $(function() {
$('body').keydown(function(e) {
- // ctrl+]
- if(e.which === 221 && e.ctrlKey) {
+ // alt+]
+ if(e.which === 221 && e.altKey) {
$('.copyLink').click();
}
});
[14/27] git commit: ISIS-537 Reintroduce the CopyLink functionality
in EntityHeaderPanel only
Posted by da...@apache.org.
ISIS-537 Reintroduce the CopyLink functionality in EntityHeaderPanel only
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/61466b6f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/61466b6f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/61466b6f
Branch: refs/heads/master
Commit: 61466b6fa0370e0a55df40de1c7e9b74cce9b9b0
Parents: 430273c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Nov 1 15:56:30 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Nov 1 15:56:30 2014 +0200
----------------------------------------------------------------------
.../components/ComponentFactoryRegistrarDefault.java | 3 ++-
.../java/org/apache/isis/viewer/wicket/ui/ComponentType.java | 8 ++++----
.../wicket/ui/components/entity/header/EntityHeaderPanel.css | 5 -----
.../ui/components/entity/header/EntityHeaderPanel.html | 4 ++--
.../ui/components/entity/header/EntityHeaderPanel.java | 3 +--
.../icontitle/EntityIconTitleAndCopyLinkPanelFactory.java | 3 +--
.../isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js | 2 +-
7 files changed, 11 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/61466b6f/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
index b70d111..21a3f2c 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
@@ -40,6 +40,7 @@ import org.apache.isis.viewer.wicket.ui.components.entity.collections.EntityColl
import org.apache.isis.viewer.wicket.ui.components.entity.combined.EntityCombinedPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.header.EntityHeaderPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconTitleAndCopyLinkPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.properties.EntityPropertiesPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.selector.links.EntityLinksSelectorPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.*;
@@ -138,7 +139,7 @@ public class ComponentFactoryRegistrarDefault implements ComponentFactoryRegistr
// lower-level
componentFactories.add(new EntityIconAndTitlePanelFactory());
- // componentFactories.add(new EntityIconTitleAndCopyLinkPanelFactory());
+ componentFactories.add(new EntityIconTitleAndCopyLinkPanelFactory());
componentFactories.add(new EntityHeaderPanelFactory());
componentFactories.add(new EntityPropertiesPanelFactory());
componentFactories.add(new EntityCollectionsPanelFactory());
http://git-wip-us.apache.org/repos/asf/isis/blob/61466b6f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
index ebc41de..c91c753 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
@@ -60,10 +60,10 @@ public enum ComponentType {
* Icon and title for a single entity.
*/
ENTITY_ICON_AND_TITLE,
-// /**
-// * Icon, title and a copy link for a single entity.
-// */
-// ENTITY_ICON_TITLE_AND_COPYLINK,
+ /**
+ * Icon, title and a copy link for a single entity.
+ */
+ ENTITY_ICON_TITLE_AND_COPYLINK,
/**
* Title, icon and action list for a single entity.
*/
http://git-wip-us.apache.org/repos/asf/isis/blob/61466b6f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
index 7785ccf..55c9aab 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.css
@@ -45,8 +45,3 @@ div.entityHeaderPanel .entityActions .cssMenuPanel .cssMenuItems:first-child {
font-weight:normal;
text-decoration:none;
}
-
-
-div.entityHeaderPanel .iconAndTitleLabel {
- float: left;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/61466b6f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
index 6304813..4a20cd7 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.html
@@ -22,8 +22,8 @@
<wicket:panel>
<div class="entityHeaderPanel">
<h4 class="iconAndTitle">
- <div wicket:id="entityIconAndTitle" class="iconAndTitleLabel">[icon and title]</div>
- <span class="entityActions" wicket:id="entityActions"></span>
+ <div wicket:id="entityIconTitleAndCopylink" class="iconAndTitleLabel">[icon and title]</div>
+ <div class="entityActions" wicket:id="entityActions"></div>
<div class="clearfix"></div>
</h4>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/61466b6f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
index 1eb89a1..8ee749c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
@@ -86,8 +86,7 @@ public class EntityHeaderPanel extends PanelAbstract<EntityModel> {
}
private void addOrReplaceIconAndTitle() {
- //final ComponentFactory componentFactory = getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, getEntityModel());
- final ComponentFactory componentFactory = getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_AND_TITLE, getEntityModel());
+ final ComponentFactory componentFactory = getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, getEntityModel());
final Component component = componentFactory.createComponent(getEntityModel());
addOrReplace(component);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/61466b6f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
index 91870e3..a13e1dd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
@@ -33,8 +33,7 @@ public class EntityIconTitleAndCopyLinkPanelFactory extends EntityComponentFacto
private static final long serialVersionUID = 1L;
public EntityIconTitleAndCopyLinkPanelFactory() {
- //super(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, EntityIconTitleAndCopyLinkPanel.class);
- super(ComponentType.ENTITY_ICON_AND_TITLE, EntityIconTitleAndCopyLinkPanel.class);
+ super(ComponentType.ENTITY_ICON_TITLE_AND_COPYLINK, EntityIconTitleAndCopyLinkPanel.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/61466b6f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index 7c11e10..0d8f257 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -70,7 +70,7 @@ $(function() {
});
Wicket.Event.subscribe(Wicket.Event.Topic.AJAX_CALL_COMPLETE, function(jqEvent, attributes, jqXHR, status) {
- isisHideVeil(attributes, jqXHR, settings);
+ isisHideVeil(attributes, jqXHR, status);
});
[12/27] git commit: ISIS-537 Add a TODO: Is
CollectionContentsAsIconsPanelFactory still used. It seems it is not
referenced by anyone
Posted by da...@apache.org.
ISIS-537 Add a TODO: Is CollectionContentsAsIconsPanelFactory still used. It seems it is not referenced by anyone
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f2993a09
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f2993a09
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f2993a09
Branch: refs/heads/master
Commit: f2993a09ee13d64612afacba9794b0231516f0ad
Parents: 5dbc13f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Nov 1 15:26:52 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Nov 1 15:26:52 2014 +0200
----------------------------------------------------------------------
.../icons/CollectionContentsAsIconsPanelFactory.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f2993a09/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
index 7ff4325..1c70fb8 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanelFactory.java
@@ -32,6 +32,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
/**
* {@link ComponentFactory} for {@link CollectionContentsAsIconsPanel}.
*/
+// TODO mgrigorov: Is this still needed ? It seems it is not used.
public class CollectionContentsAsIconsPanelFactory extends ComponentFactoryAbstract {
private static final long serialVersionUID = 1L;
[07/27] git commit: ISIS-537 Use .input-sm for smaller inputs and
input groups
Posted by da...@apache.org.
ISIS-537 Use .input-sm for smaller inputs and input groups
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8470d51c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8470d51c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8470d51c
Branch: refs/heads/master
Commit: 8470d51c8f92ab19851e382c758e9684c3c1acab
Parents: ad97165
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 31 11:31:43 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 31 11:31:43 2014 +0200
----------------------------------------------------------------------
.../ui/components/scalars/ScalarPanelTextFieldAbstract.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8470d51c/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
index 225d61b..20c9ff3 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
@@ -27,7 +27,7 @@
<wicket:container wicket:id="scalarValueContainer"/>
<wicket:fragment wicket:id="text">
- <input type="text" name="scalarValue" class="form-control scalarValue" wicket:id="scalarValue" />
+ <input type="text" name="scalarValue" class="form-control input-sm scalarValue" wicket:id="scalarValue" />
</wicket:fragment>
<wicket:fragment wicket:id="textarea">
@@ -35,8 +35,8 @@
</wicket:fragment>
<wicket:fragment wicket:id="date">
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
+ <div class="input-group input-group-sm date">
+ <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control scalarValue"/>
<span class="input-group-addon"><i class="fa fa-fw fa-calendar"></i></span>
</div>
</wicket:fragment>
[19/27] git commit: ISIS-537 Implement Ctrl+] for opening the
CopyLink modal window.
Posted by da...@apache.org.
ISIS-537 Implement Ctrl+] for opening the CopyLink modal window.
https://trello.com/c/mg6o9dUI/71-the-ctrl-shortcut-to-bring-up-copy-links-dialog-is-broken-js-issue
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0b36daa7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0b36daa7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0b36daa7
Branch: refs/heads/master
Commit: 0b36daa7ba5d25a70bb4ba39f61288386cfbbec4
Parents: a62076c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Nov 2 15:23:10 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Nov 2 15:23:10 2014 +0200
----------------------------------------------------------------------
.../viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0b36daa7/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index 0d8f257..fa58e58 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -86,8 +86,15 @@ $(function() {
$(this).animate({ "backgroundColor": "#FFF" }, 1000, "linear", function() {
$(x).css('background-color','').removeClass("reloaded-after-concurrency-exception");
});
- });
-
+ });
+
+
+ $('body').keydown(function(e) {
+ // ctrl+]
+ if(e.which === 221 && e.ctrlKey) {
+ $('.copyLink').click();
+ }
+ });
});
/**
[17/27] git commit: ISIS-537 Fix a typo in javadoc. Add a TODO asking
whether CssClassFaFacetRepr should be added to MemberRepr
Posted by da...@apache.org.
ISIS-537 Fix a typo in javadoc. Add a TODO asking whether CssClassFaFacetRepr should be added to MemberRepr
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b6358653
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b6358653
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b6358653
Branch: refs/heads/master
Commit: b63586537dac2dcf6b2df2433a67780e474ae756
Parents: 1f40aa9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Nov 1 23:56:49 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Nov 1 23:56:49 2014 +0200
----------------------------------------------------------------------
.../apache/isis/core/metamodel/layoutmetadata/ActionRepr.java | 4 ++--
.../apache/isis/core/metamodel/layoutmetadata/MemberRepr.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b6358653/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/ActionRepr.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/ActionRepr.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/ActionRepr.java
index ccc03c4..c88d2ca 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/ActionRepr.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/ActionRepr.java
@@ -20,11 +20,11 @@ package org.apache.isis.core.metamodel.layoutmetadata;
* Representation of actions associated with members (properties or collections).
*
* <p>
- * Free-standing (non-associated) actions are represented simly by {@link MemberRepr}.
+ * Free-standing (non-associated) actions are represented simply by {@link MemberRepr}.
*/
public class ActionRepr {
public NamedFacetRepr named;
public DescribedAsFacetRepr describedAs;
public CssClassFacetRepr cssClass;
public CssClassFaFacetRepr cssClassFa;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6358653/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/MemberRepr.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/MemberRepr.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/MemberRepr.java
index 23388b9..14167bf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/MemberRepr.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/MemberRepr.java
@@ -34,7 +34,8 @@ public class MemberRepr {
public NamedFacetRepr named;
public DescribedAsFacetRepr describedAs;
public CssClassFacetRepr cssClass;
+ // TODO mgrigorov: should we add public CssClassFaFacetRepr cssClassFa; ?
public TypicalLengthFacetRepr typicalLength;
public MultiLineFacetRepr multiLine;
public LabelAtFacetRepr labelAt;
-}
\ No newline at end of file
+}
[02/27] git commit: ISIS-537 Update yuicompressor-maven-plugin to
1.5.0
Posted by da...@apache.org.
ISIS-537 Update yuicompressor-maven-plugin to 1.5.0
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/36f6922b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/36f6922b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/36f6922b
Branch: refs/heads/master
Commit: 36f6922bc35e8f52b11ad4e36385eed191c645ac
Parents: e523166
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Oct 28 21:41:45 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 31 10:06:24 2014 +0200
----------------------------------------------------------------------
component/viewer/wicket/pom.xml | 58 ++++++++++++++++++------------------
1 file changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/36f6922b/component/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
index 279bad3..7f0e1c0 100644
--- a/component/viewer/wicket/pom.xml
+++ b/component/viewer/wicket/pom.xml
@@ -86,35 +86,35 @@
</excludes>
</configuration>
- </plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.4.0</version>
- <configuration>
- <statistics>true</statistics>
- <jswarn>false</jswarn>
- <suffix>.min</suffix>
- <excludes>
- <exclude>**/moment.js</exclude>
- <exclude>**/moment.min.js</exclude>
- <exclude>**/bootstrap-datetimepicker.js</exclude>
- <exclude>**/bootstrap-datetimepicker.min.js</exclude>
- <exclude>**/bootstrap-growl.js</exclude>
- <exclude>**/bootstrap-growl.min.js</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ </plugin>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <version>1.5.0</version>
+ <configuration>
+ <statistics>true</statistics>
+ <jswarn>false</jswarn>
+ <suffix>.min</suffix>
+ <excludes>
+ <exclude>**/moment.js</exclude>
+ <exclude>**/moment.min.js</exclude>
+ <exclude>**/bootstrap-datetimepicker.js</exclude>
+ <exclude>**/bootstrap-datetimepicker.min.js</exclude>
+ <exclude>**/bootstrap-growl.js</exclude>
+ <exclude>**/bootstrap-growl.min.js</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<dependencyManagement>
<dependencies>