You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2013/03/19 22:16:11 UTC
[4/9] Isis-162 - redesigned Scimpi based archetype.
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug.shtml
new file mode 100644
index 0000000..1def018
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug.shtml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<swf:page-title>Debug ${type:optional}</swf:page-title>
+<swf:template file="./debug-template.shtml" />
+
+<swf:debug type="${type:optional}" value="${value:optional}" />
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/edit.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/edit.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/edit.shtml
new file mode 100644
index 0000000..313d30e
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/edit.shtml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<swf:page-title><swf:title-string /></swf:page-title>
+<swf:template file="./debug-template.shtml" />
+
+<h1>Object</h1>
+
+<div class="debug object">
+ <h2><swf:title-string /></h2>
+ <swf:long-form link-view="object.shtml" title="" />
+
+ <swf:methods link-view="object.shtml" />
+</div>
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/object.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/object.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/object.shtml
new file mode 100644
index 0000000..3d15624
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/object.shtml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<swf:page-title><swf:title-string /></swf:page-title>
+<swf:template file="./debug-template.shtml" />
+
+<h1>Object</h1>
+
+<div class="debug object">
+ <h2><swf:title-string /></h2>
+ <swf:long-form link-view="object.shtml" title="" />
+
+ <swf:methods link-view="./object.shtml" />
+</div>
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/services.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/services.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/services.shtml
new file mode 100644
index 0000000..41e9068
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/services.shtml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<swf:page-title>Debug ${type:optional}</swf:page-title>
+<swf:template file="./debug-template.shtml" />
+
+<h1>Services</h1>
+<swf:services view="./action.shtml"/>
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error.shtml
deleted file mode 100644
index 67b0ad6..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error.shtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<swf:page-title>Error!</swf:page-title>
-
-<swf:template file="scimpi/style/template.shtml" />
-
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/error-template.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/error-template.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/error-template.shtml
new file mode 100644
index 0000000..c113df6
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/error-template.shtml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>${title}</title>
+ <link rel="stylesheet" title="Style 1" href="${_context}/style/reset.css" type="text/css" media="all" />
+ <link rel="stylesheet" title="Style 1" href="${_context}/style/scimpi-base.css" type="text/css" media="all" />
+ <link rel="stylesheet" title="Style 1" href="${_context}/style/debug.css" type="text/css" media="all" />
+
+ <script src="${_context}/scripts/jquery-1.7.2.min.js" ></script>
+</head>
+
+<body>
+ <div id="banner" class="error">
+ <a href="/"><img class="logo" src="${_context}/images/logo.png" /></a>
+ <div class="title"><a href="/">Web App Error</a></div>
+ <img class="scimpi" src="${_context}/images/scimpi-logo.png" />
+ </div>
+ <swf:content />
+
+ <div id="footer">
+ <div id="debug">
+ <p>Debug <a target="debug" href="${_context}/debug/debug.shtml">system</a>
+ <swf:when variable-exists="_result"> | <a target="debug" href="${_context}/debug/object.shtml?_result=${_result:optional}">object</a></swf:when></p>
+ <p><strong>Template used:</strong> ${_directory}${_this}</p>
+ <p><strong>Request:</strong> ${_base}</p>
+ </div>
+ </div>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/notfound_404.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/notfound_404.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/notfound_404.shtml
new file mode 100644
index 0000000..fa3f11e
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/notfound_404.shtml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<swf:page-title>Page Not Found</swf:page-title>
+<swf:template file="./error-template.shtml" />
+
+<div id="content" class="error">
+ <h1>Error 404... page not found...</h1>
+
+ <p>The page that you requested could not be found. Use the link below to return to main page so that you can continue. If this
+ appears to be a real problem then use the link below to get in touch with the developers.</p>
+
+ <p class="error-links">
+ <a href="${_context}/index.shtml">Return to application</a>
+ <a id="message" href="mailto:support@domain?subject=Page%20not%20accessible%20${_error-ref:optional}">send feedback</a>
+ </p>
+</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/security_403.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/security_403.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/security_403.shtml
new file mode 100644
index 0000000..04b5747
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/security_403.shtml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<swf:page-title>Page Not Accessible</swf:page-title>
+<swf:template file="./error-template.shtml" />
+
+<div id="content" class="error">
+ <h1>error 403... page not accessible...</h1>
+
+ <p><strong>${_security-error}</strong></p>
+ <p><strong>${_security-context}</strong></p>
+
+ <swf:print-authorization-clause />
+
+ <p><small>${_security-identifier:optional}:${_security-roles}</small></p>
+</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/server_500.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/server_500.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/server_500.shtml
new file mode 100644
index 0000000..d8205c1
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/error/server_500.shtml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<swf:page-title>Internal Error</swf:page-title>
+<swf:template file="./error-template.shtml" />
+
+<swf:variable name="reference"><swf:error-reference /></swf:variable>
+<swf:variable name="details"><swf:error-details /></swf:variable>
+
+<div id="content" class="error">
+ <h1>Something has gone wrong, sorry about that...</h1>
+
+ <p>An error has occurred on the server. Using the links below, either contact the developers and let them know how it happened so
+ they can fix it, or go back to the main page and try again.</p>
+ <swf:show-debug>
+ <swf:when variable-exists="details">
+ <p>As this application is in development mode you can also look at all the debug details using the third link.</p>
+ </swf:when>
+ </swf:show-debug>
+
+ <p class="error-links">
+ <a id="message" href="mailto:support@domain?subject=System%20failure%20reference%20${reference}">Send feedback</a>
+ <a href="${_context}/index.shtml">Return to application</a>
+ <swf:show-debug>
+ <swf:when variable-exists="details">
+ <a href="#" onclick="$('#dev-help').toggle(); return false;">Display details...</a>
+ </swf:when>
+ </swf:show-debug>
+ </p>
+</div>
+
+<swf:show-debug>
+ <swf:when variable-exists="details">
+ <div id="dev-help" class="debug" style="display: none; cursor: pointer;">
+ <h2>Debug</h2>
+ <p class="error"><strong>Error 500...</strong> an internal error has occurred: <strong><em><swf:error-message /></em></strong> (ref: #${reference})</p>
+ <p class="error"></p>
+ <swf:error-details />
+ </div>
+ </swf:when>
+</swf:show-debug>
+
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/action.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/action.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/action.shtml
index 49bd03c..f3bc3ae 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/action.shtml
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/action.shtml
@@ -18,7 +18,7 @@
under the License.
-->
<swf:page-title>Action <swf:action-name method="${_method}"/></swf:page-title>
-<swf:template file="../scimpi/style/template.shtml" />
+<swf:template file="../page-template.shtml" />
<swf:action-form method="${_method}" view="_generic.shtml" ${_cancel-to:optional}/>
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/collection.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/collection.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/collection.shtml
index 7ac8411..a3c372a 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/collection.shtml
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/collection.shtml
@@ -18,9 +18,8 @@
under the License.
-->
<swf:page-title><swf:element-type /> Listing</swf:page-title>
-<swf:template file="../scimpi/style/template.shtml" />
+<swf:template file="../page-template.shtml" />
-<h2>${title}</h2>
-<swf:table xxtitle="My Little Table" xxxno-columns="7" xxheader="no" footer="yes" link="_generic.shtml" />
+<swf:table title="${title}" no-columns="4" footer="yes" link="_generic.shtml" />
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/edit.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/edit.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/edit.shtml
index af9c922..0266909 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/edit.shtml
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/edit.shtml
@@ -18,9 +18,9 @@
under the License.
-->
<swf:page-title>Edit <swf:title-string /></swf:page-title>
-<swf:template file="../scimpi/style/template.shtml" />
+<swf:template file="../page-template.shtml" />
<h2>Edit <swf:title /></h2>
-<swf:edit />
+<swf:edit button-title="Save Changes" title="" />
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/object.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/object.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/object.shtml
index f641317..53178e2 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/object.shtml
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/generic/object.shtml
@@ -18,10 +18,9 @@
under the License.
-->
<swf:page-title><swf:title-string /></swf:page-title>
-<swf:template file="../scimpi/style/template.shtml" />
+<swf:template file="../page-template.shtml" />
-<h2><swf:title /></h2>
-<swf:long-form link="_generic.shtml" title="" />
+<swf:long-form link="_generic.shtml" />
<swf:methods />
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/calendar.gif
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/calendar.gif b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/calendar.gif
new file mode 100644
index 0000000..d0abaa7
Binary files /dev/null and b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/calendar.gif differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/logo.png
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/logo.png b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/logo.png
new file mode 100644
index 0000000..63d6083
Binary files /dev/null and b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/logo.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/scimpi-logo.png
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/scimpi-logo.png b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/scimpi-logo.png
new file mode 100644
index 0000000..ea4cbc1
Binary files /dev/null and b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/images/scimpi-logo.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/index.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/index.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/index.shtml
index c3a970b..4bd8570 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/index.shtml
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/index.shtml
@@ -17,6 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-<swf:page-title>ToDo App</swf:page-title>
+<swf:page-title>Web App</swf:page-title>
-<swf:template file="scimpi/style/template.shtml" />
+<swf:template file="./page-template.shtml" />
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/login.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/login.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/login.shtml
index 2c6f18d..fcbd9ce 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/login.shtml
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/login.shtml
@@ -17,12 +17,29 @@
specific language governing permissions and limitations
under the License.
-->
-<swf:template file="scimpi/style/site-template.shtml" />
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>Web App. - Log On</title>
+ <link rel="stylesheet" title="Style 1" href="${_context}/style/reset.css" type="text/css" media="all" />
+ <link rel="stylesheet" title="Style 1" href="${_context}/style/scimpi-base.css" type="text/css" media="all" />
+
+ <script src="${_context}/scripts/jquery-1.7.2.min.js" ></script>
+ <script src="${_context}/scripts/jquery-ui-1.8.20.custom.min.js" ></script>
+ <script src="${_context}/scripts/scimpi.js" ></script>
+</head>
-<style>
-div#content {
- margin-left: 2em;
-}
-</style>
-<h2>Please Log On</h2>
-<swf:logon view="index.shtml"/>
+<body id="login">
+ <div id="banner">
+ <img class="logo" src="images/logo.png" />
+ <div class="title"><a href="/">Web App</a></div>
+ <img class="scimpi" src="images/scimpi-logo.png" />
+ </div>
+ <div id="content" class="logon">
+ <swf:feedback />
+ <h1>Log In</h1>
+ <swf:logon class="action" view="/" />
+ </div>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/page-template.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/page-template.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/page-template.shtml
new file mode 100644
index 0000000..ec102d7
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/page-template.shtml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<swf:template file="./site-template.shtml" />
+
+<div id="side">
+ <h2>Services</h2>
+ <swf:services />
+</div>
+<div id="main">
+ <swf:content />
+</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/custom/new-todo.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/custom/new-todo.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/custom/new-todo.shtml
deleted file mode 100644
index b36c272..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/custom/new-todo.shtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<swf:page-title>New To Do</swf:page-title>
-
-<swf:template file="../style/template.shtml" />
-
-<swf:action-form object="service:toDoItems" method="newToDo" button-title="Save" />
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/images/scimpi-logo.png
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/images/scimpi-logo.png b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/images/scimpi-logo.png
deleted file mode 100644
index ea4cbc1..0000000
Binary files a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/images/scimpi-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/reset.css
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/reset.css b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/reset.css
deleted file mode 100644
index 5839a5c..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/reset.css
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.
- */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
- margin: 0;
- padding: 0;
- border: 0;
- outline: 0;
- font-weight: inherit;
- font-style: inherit;
- font-size: 100%;
- font-family: inherit;
- vertical-align: baseline;
-}
-input, textarea {
- margin: 0;
- padding: 0;
- outline: 0;
-}
-:focus {
- outline: 0;
-}
-body {
- line-height: 1;
- color: black;
- background: white;
-}
-ol, ul {
- list-style: none;
-}
-table {
- border-collapse: separate;
- border-spacing: 0;
-}
-caption, th, td {
- text-align: left;
- font-weight: normal;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
- content: "";
-}
-blockquote, q {
- quotes: "" "";
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/screen.css
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/screen.css b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/screen.css
deleted file mode 100644
index 09df6e3..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/screen.css
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * 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.
- */
-body {
- font-family: Arial, Sans-Serif;
- margin: 0 0 10px 0;
- color: black;
- background-color: #0;
- font-size: 16px;
-}
-em {
- font-style: italic;
-}
-strong {
- font-weight: bold;
-}
-h1, h2, h3, div#title, form .title {
- margin-bottom: 0.8em;
- font-weight: bold;'
- letter-spacing: 2px;
- text-shadow: 0.1em 0.1em 0.1em #bbb;
-}
-h1 {
- font-size: 200%;
-}
-h2, form .title {
- margin-top: 1.5em;
- font-size: 160%;
-}
-ol, ul {
- margin: 1em 0 2em 0
-}
-li {
- margin: 0.3em 0;
-}
-/*
-* Overall Layout
-*/
-div#banner {
- background-color: #dde;
- width: 100%;
- height: 76px;
- border-bottom: 10px solid gray;
-}
-div#content {
- position: absolute;
-}
-div#side {
- height: 100%;
- width: 300px;
- margin-right: 30px;
- padding-left: 20px;
- min-height: 400px;
- border-bottom: 70px transparent solid; /* should be the same as the #footer height */
-}
-div#main {
- position: absolute;
- min-width: 500px;
- left: 321px; /* should math the width of #side */
- top: 0;
- border-bottom: 70px transparent solid; /* should be the same as the #footer height */
-}
-div#footer {
- position: fixed;
- width: 100%;
- height: 70px;
- bottom: 0;
- padding-left: 20px;
- background-color: #eee;
- border-top: 1px solid gray;
-}
-/*
-* Banner
-*/
-div#logo {
- position: absolute;
- right: 30px;
-}
-div#title {
- padding-top: 20px;
- padding-left: 20px;
- font-size: 200%;
- font-weight: bold;
- font-style: italic;
-}
-div#title a {
- color: black;
- text-decoration: none;
-}
-div.user {
- position: absolute;
- top: 4px;
- right: 18em;
- font-size: 70%;
-}
-form.login .field {
- display: inline;
-}
-form.login .field * {
- display: inline;
- position: relative;
- margin: 0;
-}
-form.login .field input {
- margin-left: 0.6em;
-}
-
-
-
-/*
-* Footer
-*/
-div#debug {
- padding: 10px 0;
-}
-div#debug > * {
- font-size: 70%;
- margin: 5px 0;
-}
-
-/*
-* Side bar
-*/
-div#side ol {
- padding-left: 0px;
-}
-div#side li {
- list-style: none;
- line-height: 1.5em
-}
-xxdiv#side li a {
- text-decoration: none;
- color: inherit;
-}
-xxdiv#side li a:HOVER {
- text-decoration: underline;
-}
-xxdiv#side li a:VISITED {
- color: inherit;
-}
-
-
-
-a {
- text-decoration: none;
- color: inherit;
-}
-a:HOVER {
- text-decoration: underline;
-}
-a:VISITED {
- color: inherit;
-}
-
-
-
-/*
-* Forms
-*/
-.form {
- margin-bottom: 2em;
-}
-.field {
- position: relative;
- min-height: 1.5em;
- margin-bottom: 1em;
-}
-.field > * {
- display: inline-block;
- font-size: 100%;
-}
-.field > * {
- margin-left: 10em;
-}
-.field > .label {
- margin-left: 0;
- position: absolute;
- padding-top: 0.4em;
- font-style: italic;
- font-size: 90%;
-}
-.field > .value {
- white-space: pre-wrap;
-}
-.field > .required {
- margin-left: 0;
- vertical-align: top;
-}
-textarea {
- font-family: Arial, Sans-Serif;
-}
-
-
-.actions {
- margin-bottom: 2.5em;
-}
-.action {
- margin-bottom: 1em;
- min-height: 20px;
-}
-
-xxxform.action a.button,
-xxxform.action,
-form.full input.button {
- xxxmargin-top: 1em;
- margin-left: 12.5em;
-}
-form.full input.button + input.button {
- xxxmargin-top: 1em;
- margin-left: 0.5em;
-}
-.action .form .label,
-.action.field label {
- xxxvertical-align: 2px;
- xxxpadding-top: 12px;
- font-style: italic;
-}
-a.action > .button {
- font-size: 90%;
- border:1px red solid;
-}
-.edit > .button,
-.action > .button,
-.action > .disabled,
-.controls > .button,
-.controls > form > .button {
- shadow: 1px 1px black;
- border: 1px solid gray;
- border-radius: 4px;
- font-size: 80%;
- text-decoration: none;
- cursor: default;
- padding: 5px 12px;
- xxxsmin-height: 1em;
-}
-.edit > .button,
-.action > .button,
-.controls > .button,
-.controls > form > .button {
- background-color: #666;
- text-shadow: 1px 1px black;
- color: #ddd
-}
-td input.button,
-td a.button {
- vertical-align: 2px;
-}
-td form.element-delete {
- margin-left: 4px;
-}
-.controls > form {
- display: inline;
-}
-.action > .disabled {
- background-color: #aaa;
- xxtext-shadow: 1px 1px white;
- color: #666;
-}
-xxxform#newToDo .title {
- font-size: 140%;
- font-weight: bold;
- margin-top: 1.5em;
- margin-bottom: 0.5em;
-}
-xxxform#newToDo label {
- display: none;
-}
-xxxxform#newToDo input {
- margin-left: 0;
-}
-p.alternative {
- margin-top: 80px;
- font-size: 80%;
- font-style: italic;
-}
-table {
- width: 100%;
-}
-thead, tfoot {
- background-color: #aaa;
- color: #fff;
- font-size: 70%;
-}
-tr.even-row {
- background-color: #eee;
-}
-tr.odd-row {
- border-bottom: 1px solid #bbb;
-}
-tr.odd-row td {
- border-bottom: 1px solid #bbb;
-}
-tr:HOVER {
- background-color: #efe;
-}
-tr:HOVER a {
- text-decoration: underline;
-}
-td, th {
- padding: 7px 10px;
- min-width: 150px;
- max-width: 300px;
-}
-td.controls {
- font-size: 80%;
-}
-th {
- xxxfont-weight: bold;
-}
-span.error,
-.errors {
- color: red;
- font-size: 80%;
-}
-span.error {
- maring-left: 6px;
-}
-
-
-
-input {
- xxxborder: 1px red solid;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/site-template.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/site-template.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/site-template.shtml
deleted file mode 100644
index 27a2a9d..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/site-template.shtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>${title}</title>
- <link rel="stylesheet" title="Style 1" href="${_context}/scimpi/style/reset.css" type="text/css" media="all" />
- <link rel="stylesheet" title="Style 1" href="${_context}/scimpi/style/screen.css" type="text/css" media="all" />
-</head>
-
-<body id="demo">
-
-<div id="banner">
- <div id="logo"><img src="${_context}/scimpi/images/scimpi-logo.png"/></div>
- <div id="title"><a href="/">To-Do App</a></div>
- <swf:user login-view="/login.shtml" logout-view="/login.shtml" />
-</div>
-
-<div id="content">
- <swf:content />
-</div>
-
-<div id="footer">
- <div style="float:right; margin-right: 40px;">
- <a href="${_context}/index.html">home</a> | <a href="${_context}/logon.htmlviewer">html</a> | <a href="${_context}/services">rest</a> | <a href="${_context}/mobile/index.html">mobile</a>
- </div>
- <div id="debug">
- <h1>Debug <a href="/debug.app">open</a></h1>
- <p><strong>Template used:</strong> ${_directory}${_this}</p>
- <p><strong>Request:</strong> ${_base}</p>
- </div>
- <div style="clear:both;"/>
- <swf:diagnostics/>
-</div>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/template.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/template.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/template.shtml
deleted file mode 100644
index 8535da7..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/scimpi/style/template.shtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-
-<swf:template file="../style/site-template.shtml" />
-
-<div id="side">
- <h2>My To Dos</h2>
- <swf:run-action object="service:toDoItems" method="notYetDone" result-name="todos" />
- <swf:list object="${todos}" link="${_context}/_generic.shtml" />
-
- <swf:button href="../scimpi/custom/new-todo.shtml">New To Do...</swf:button>
-
-</div>
-
-<div id="main">
- <swf:feedback />
- <swf:content />
-</div>