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/10/24 18:03:26 UTC
[12/15] git commit: ISIS-537 Replace all btn-default with
btn-primary. btn-default is preserved for reset/cancel type links/buttons
ISIS-537 Replace all btn-default with btn-primary. btn-default is preserved for reset/cancel type links/buttons
Use fa-fw (fixed width) FontAwesome icons
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cc2b39fa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cc2b39fa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cc2b39fa
Branch: refs/heads/master
Commit: cc2b39fab138812abde3c91723a9942478e85e95
Parents: b666085
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 24 16:37:31 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 24 16:37:31 2014 +0300
----------------------------------------------------------------------
.../ui/components/actions/ActionParametersFormPanel.html | 2 +-
.../ui/components/additionallinks/AdditionalLinksPanel.html | 2 +-
.../ui/components/bookmarkedpages/BookmarkedPagesPanel.html | 4 ++--
.../ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java | 2 +-
.../collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java | 6 +++---
.../unresolved/CollectionContentsAsUnresolvedPanelFactory.java | 2 +-
.../ui/components/entity/properties/EntityPropertiesPanel.html | 2 +-
.../ui/components/scalars/ScalarPanelTextFieldAbstract.html | 2 +-
.../scalars/isisapplib/IsisBlobOrClobPanelAbstract.html | 2 +-
.../widgets/zclip/SimpleClipboardModalWindowPanel.html | 2 +-
.../wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html | 2 +-
.../org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html | 4 ++--
.../wicket/ui/selector/links/LinksSelectorPanelAbstract.html | 4 ++--
13 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
index c852e30..9bdfbb6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
@@ -28,7 +28,7 @@
</div>
<span wicket:id="feedback"></span>
<div class="buttons">
- <input type="submit" wicket:id="okButton" value="OK" class="ok btn btn-xs btn-success"/>
+ <input type="submit" wicket:id="okButton" value="OK" class="ok btn btn-xs btn-primary"/>
<input type="submit" wicket:id="cancelButton" value="Cancel" class="cancel btn btn-xs btn-default"/>
</div>
</fieldset>
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.html
index e5cc617..ff546bc 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.html
@@ -26,7 +26,7 @@
<wicket:panel>
<ul wicket:id="additionalLinkList" class="additionalLinkList list-unstyled list-inline">
<li wicket:id="additionalLinkItem" class="additionalLinkItem">
- <a href="#" wicket:id="additionalLink" class="btn btn-xs btn-default">
+ <a href="#" wicket:id="additionalLink" class="btn btn-xs btn-primary">
<span wicket:id="additionalLinkFontAwesome"/>
<span wicket:id="additionalLinkTitle" class="additionalLinkItem">[link title]</span>
</a>
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
index 4f56f37..8df8ad7 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
@@ -32,7 +32,7 @@
<div class="panel-group">
<div class="panel panel-default">
<div class="panel-heading">
- <h4 class="panel-title"><span class="fa fa-bookmark"></span> Bookmarks</h4>
+ <h4 class="panel-title"><span class="fa fa-fw fa-bookmark"></span> Bookmarks</h4>
</div>
<div class="panel-body" wicket:enclosure="helpText">
@@ -52,7 +52,7 @@
</a>
<a href="#" wicket:id="clearBookmarkLink" class="clearBookmarkPlaceHolder pull-right">
- <span class="fa fa-ban text-danger"></span>
+ <span class="fa fa-fw fa-ban text-danger"></span>
</a>
</div>
</li>
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
index e738200..0307822 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanelFactory.java
@@ -60,6 +60,6 @@ public class CollectionContentsAsAjaxTablePanelFactory extends ComponentFactoryA
@Override
public IModel<String> getCssClass() {
- return Model.of("fa fa-table");
+ return Model.of("fa fa-fw fa-table");
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
index 0200b56..b8e0a59 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
@@ -45,9 +45,9 @@ public class IsisAjaxHeadersToolbar<S> extends AbstractToolbar
{
private static final long serialVersionUID = 1L;
- private static final String CLASS_SORT_NONE = "fa fa-sort";
- private static final String CLASS_SORT_UP = "fa fa-sort-up";
- private static final String CLASS_SORT_DOWN = "fa fa-sort-down";
+ private static final String CLASS_SORT_NONE = "fa fa-fw fa-sort";
+ private static final String CLASS_SORT_UP = "fa fa-fw fa-sort-up";
+ private static final String CLASS_SORT_DOWN = "fa fa-fw fa-sort-down";
static abstract class CssAttributeBehavior extends Behavior
{
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanelFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanelFactory.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanelFactory.java
index 306ca82..d2f340b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanelFactory.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/unresolved/CollectionContentsAsUnresolvedPanelFactory.java
@@ -64,6 +64,6 @@ public class CollectionContentsAsUnresolvedPanelFactory extends ComponentFactory
@Override
public IModel<String> getCssClass() {
- return Model.of("fa fa-eye-slash");
+ return Model.of("fa fa-fw fa-eye-slash");
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
index 7e36c1e..5af34a0 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesPanel.html
@@ -40,7 +40,7 @@
<span wicket:id="feedback"></span>
</div>
<div class="buttons">
- <input type="submit" class="edit btn btn-success btn-xs" wicket:id="edit"/>
+ <input type="submit" class="edit btn btn-primary btn-xs" wicket:id="edit"/>
<input type="submit" class="ok btn-info btn-xs" wicket:id="ok"/>
<input type="submit" class="cancel btn-default btn-xs" wicket:id="cancel"/>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/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 fba5b53..225d61b 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
@@ -37,7 +37,7 @@
<wicket:fragment wicket:id="date">
<div class="input-group date">
<input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ <span class="input-group-addon"><i class="fa fa-fw fa-calendar"></i></span>
</div>
</wicket:fragment>
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/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 324a46c..9073598 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-default" wicket:id="scalarIfRegularDownload"><span class="downloadTitle">Download</span></a>
+ <a class="download btn btn-xs 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/cc2b39fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html
index 3804fc8..527d79d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/SimpleClipboardModalWindowPanel.html
@@ -28,7 +28,7 @@
<input wicket:id="textField" class="form-control linkUrl"/>
</div>
</div>
- <input type="submit" value="OK" class="ok btn btn-xs btn-success" onclick="$(this).closest('.modal').modal('hide'); return false;"/>
+ <input type="submit" value="OK" class="ok btn btn-xs btn-primary" onclick="$(this).closest('.modal').modal('hide'); return false;"/>
</form>
</div>
</wicket:panel>
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
index 38f0b4b..f4c8857 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.html
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<a wicket:id="copyLink" href="#" class="copyLink">
- <i class="fa fa-link fa-lg"></i>
+ <i class="fa fa-fw fa-link fa-lg"></i>
</a>
<wicket:remove>
TODO reenable the subscribing link after figuring out what it is.
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/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 4ce3bcf..5e97ba2 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
@@ -51,11 +51,11 @@
<ul class="nav navbar-nav">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
- <i class="fa fa-user"></i> <span wicket:id="userName"></span><span class="caret"></span>
+ <i class="fa fa-fw fa-user"></i> <span wicket:id="userName"></span><span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu" style="min-width: 0px;">
<li class="navbar-right">
- <a wicket:id="logoutLink"><i class="fa fa-sign-out"></i><wicket:message key="logoutLabel"></wicket:message></a>
+ <a wicket:id="logoutLink"><i class="fa fa-fw fa-sign-out"></i><wicket:message key="logoutLabel"></wicket:message></a>
</li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/isis/blob/cc2b39fa/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
index f434680..3b20b00 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
@@ -23,11 +23,11 @@
<wicket:panel>
<div class="linksSelectorPanel">
<div class="btn-group viewLinks" wicket:id="views">
- <button type="button" class="btn btn-xs btn-default">
+ <button type="button" class="btn btn-xs btn-primary">
<span wicket:id="viewButtonIcon" class="ViewLinkItem"></span>
<span wicket:id="viewButtonTitle" class="ViewLinkItemTitle"></span>
</button>
- <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown">
+ <button type="button" class="btn btn-xs btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul wicket:id="viewList" class="dropdown-menu dropdown-menu-right" role="menu">