You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2019/04/04 10:20:24 UTC
[incubator-netbeans] branch release110 updated: NETBEANS-1820
Deleting images with licensing conerns (#1179)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release110
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/release110 by this push:
new d195118 NETBEANS-1820 Deleting images with licensing conerns (#1179)
d195118 is described below
commit d195118d7cff2ba3c2ff747e5ff2a9c0a8db2f56
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Tue Apr 2 23:37:55 2019 +0200
NETBEANS-1820 Deleting images with licensing conerns (#1179)
* NETBEANS-1820 Deleting images with licensing conerns
* NETBEANS-1820 Removing EaselDemo and references
* NETBEANS-1820 Tweaking build.xxml and licenseinfo.xml
* NETBEANS-1820 Tweaking build.xxml to include line 24
* NETBEANS-1820 Removing refs to sample
---
.../EaselDemo/nbproject/project.properties | 26 --
.../EaselDemo/nbproject/project.xml | 25 --
.../EaselDemo/public_html/about.html | 161 ---------
.../public_html/css/images/ajax-loader.png | Bin 366 -> 0 bytes
.../EaselDemo/public_html/css/images/close_pop.png | Bin 1958 -> 0 bytes
.../public_html/css/images/icons-18-black.png | Bin 1948 -> 0 bytes
.../public_html/css/images/icons-18-white.png | Bin 1958 -> 0 bytes
.../public_html/css/images/icons-36-black.png | Bin 3748 -> 0 bytes
.../public_html/css/images/icons-36-white.png | Bin 3746 -> 0 bytes
.../EaselDemo/public_html/css/style.css | 157 ---------
.../EaselDemo/public_html/img/cute_rabbit1.jpg | Bin 26852 -> 0 bytes
.../EaselDemo/public_html/img/cute_rabbit2.jpg | Bin 5156 -> 0 bytes
.../EaselDemo/public_html/img/cute_rabbit3.jpg | Bin 42081 -> 0 bytes
.../public_html/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes
.../public_html/img/glyphicons-halflings.png | Bin 13826 -> 0 bytes
.../EaselDemo/public_html/img/kitten1.jpg | Bin 17388 -> 0 bytes
.../EaselDemo/public_html/img/rabbit1.jpg | Bin 75107 -> 0 bytes
.../EaselDemo/public_html/img/rabbit2.jpg | Bin 28777 -> 0 bytes
.../EaselDemo/public_html/img/rabbit3.jpg | Bin 144791 -> 0 bytes
.../EaselDemo/public_html/index.html | 128 -------
.../EaselDemo/public_html/js/about.js | 119 -------
.../EaselDemo/public_html/js/draganddrop.js | 54 ---
.../EaselDemo/public_html/js/loadWelcome.js | 50 ---
.../EaselDemo/public_html/rest/RestClient.js | 392 ---------------------
.../public_html/rest/resources/id19974892.json | 1 -
.../public_html/rest/resources/id19985678.json | 1 -
.../public_html/rest/resources/id19986196.json | 1 -
.../public_html/rest/resources/id19986982.json | 1 -
.../public_html/rest/resources/manufacturer.json | 1 -
.../EaselDemo/public_html/tableui.html | 138 --------
webcommon/web.client.samples/build.xml | 8 -
webcommon/web.client.samples/licenseinfo.xml | 20 --
.../netbeans/modules/web/client/samples/layer.xml | 8 -
.../web/client/samples/wizard/ui/Bundle.properties | 1 -
34 files changed, 1292 deletions(-)
diff --git a/webcommon/web.client.samples/EaselDemo/nbproject/project.properties b/webcommon/web.client.samples/EaselDemo/nbproject/project.properties
deleted file mode 100644
index 2ae00d8..0000000
--- a/webcommon/web.client.samples/EaselDemo/nbproject/project.properties
+++ /dev/null
@@ -1,26 +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.
-browser.autorefresh.SL__Browsers_ChromeBrowser=true
-browser.autorefresh.SL__Browsers_webviewBrowser=true
-browser.highlightselection.SL__Browsers_ChromeBrowser=true
-browser.highlightselection.SL__Browsers_webviewBrowser=true
-files.encoding=windows-1252
-server=internal
-site.root.folder=public_html
-start.file=index.html
-test.folder=test
-web.context.root=/${project.name}
diff --git a/webcommon/web.client.samples/EaselDemo/nbproject/project.xml b/webcommon/web.client.samples/EaselDemo/nbproject/project.xml
deleted file mode 100644
index 5989b93..0000000
--- a/webcommon/web.client.samples/EaselDemo/nbproject/project.xml
+++ /dev/null
@@ -1,25 +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.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.clientproject</type>
- <configuration/>
-</project>
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/about.html b/webcommon/web.client.samples/EaselDemo/public_html/about.html
deleted file mode 100644
index 4deb6f4..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/about.html
+++ /dev/null
@@ -1,161 +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.
-
--->
-<!doctype html>
-<html>
- <head>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
- <link rel="stylesheet" href="css/style.css" type="text/css"/>
- <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/css/bootstrap.css" type="text/css"/>
- <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/css/bootstrap-responsive.css" type="text/css"/>
-
- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.js"></script>
- <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.js"></script>
- <script type="text/javascript" src="js/about.js"></script>
-
- <style type="text/css">
- body {
- padding-top: 60px;
- padding-bottom: 40px;
- }
- </style>
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <title>Project Easel Demo - HTML5, jQuery, REST</title>
- </head>
- <body>
- <div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container-fluid">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="#">Project name</a>
-
- <div class="btn-group pull-right">
- <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
- <i class="icon-user"></i> Username
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li><a href="#">Profile</a></li>
- <li class="divider"></li>
- <li><a href="#">Sign Out</a></li>
- </ul>
- </div>
- <div class="nav-collapse">
- <ul class="nav">
- <li><a href="index.html">Home</a></li>
- <li class="active"><a href="about.html">About</a></li>
- <li><a href="tableui.html">Rest Client</a></li>
- <li><a href="#contact">Contact</a></li>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
- </div>
-
- <div class="container-fluid">
- <div class="row-fluid">
- <div class="span9">
- <div class="hero-unit">
- <div id="rest">
- <p>REST sample will go in here<br/>
- <a class="btn" id="loadRestBtn" onclick="loadRest()">Load REST Data</a>
- </p>
- </div>
- <div id='restDetails' class='restDetails'>
- <table>
- <tr><td id="restName"></td></tr>
- <tr><td id="restRep"></td></tr>
- <tr><td id="restEmail"></td></tr>
- <tr><td id="restPhone"></td></tr>
- </table>
- <p>
- <a class='btn' onclick='dataSwitch()'>« Return</a>
- </p>
- </div>
- </div>
- </div>
- </div>
- <div class="row-fluid">
-
- <!-- This is the drag and drop code -->
- <div id="DandD_div" class="span3">
- <p id="draganddrop" class="fancy">HTML5 Drag and Drop example: Drag the kitten up to visit the bunny.</p>
- <div id="div1" ondrop="drop(event)" ondragover="allowDrop(event)">
- <img id="drop1" src="img/rabbit3.jpg" width="100" height="100" style="padding: 10px" />
- </div>
- <img id="drag1" src="img/kitten1.jpg" draggable="true" ondragstart="drag(event)" width="100" height="120" style="padding: 10px" />
- </div>
-
- <!--
- // jQuery animation example section
- // All javascript for the animations is in about.js
- -->
- <div class="span4">
- <p id="jquery" class="fancy">A simple jQuery animation</p>
- <button id="start">Start Me Up!</button>
- <div id="animation-div" style="background-color: blueviolet; position: relative; width: 100px; height: 100px" >
- </div>
- </div>
- <div class="span4">
- <p id="show_hide" class="fancy">Div transition</p>
- <button id="switch">Switch!</button>
- <div id="blue_div" style="background-color: blue; position: relative; width: 100px; height: 100px"></div>
- <div id="red_div" style="display: none; background-color: red; position: relative; width: 100px; height: 100px"></div>
- </div>
- </div>
- <div class="row-fluid">
- <div class="span4">
- <div id="jsonp_test" style="position: relative;"><a class="btn tweet-window" href="#tweetBox" >Show weather in Prague</a></div>
- </div>
- </div>
- </div>
-
- <div id="tweetBox" class="tweet-popup">
- <a href='#' class='tweet-close'><img src='css/images/close_pop.png' class='btn_close' title='Close Window' alt='Close' /></a>
- <form method='post' class='signin' action='#'>
- <fieldset class='tweetbox'>
- <label>
- <span id="tweetImg"></span>
- </label>
- <label>
- <span id="tweetUsername" class='username'></span>
- <span id="tweetUser" style="font-size: 12px;"></span>
- </label>
- <div id="tweetText" ></div><br/>
- <div id="dataSource">Data from <a href="http://openweathermap.org">openweathermap.org</a></div>
- </fieldset>
- </form>
- </div>
-
- <script type="text/javascript" src="js/draganddrop.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-dropdown.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-collapse.js"></script>
- </body>
-</html>
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/css/images/ajax-loader.png b/webcommon/web.client.samples/EaselDemo/public_html/css/images/ajax-loader.png
deleted file mode 100644
index 0973ae0..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/css/images/ajax-loader.png and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/css/images/close_pop.png b/webcommon/web.client.samples/EaselDemo/public_html/css/images/close_pop.png
deleted file mode 100644
index 81b5e45..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/css/images/close_pop.png and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-18-black.png b/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-18-black.png
deleted file mode 100644
index 32fa6e7..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-18-black.png and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-18-white.png b/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-18-white.png
deleted file mode 100644
index f4e6787..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-18-white.png and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-36-black.png b/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-36-black.png
deleted file mode 100644
index e508159..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-36-black.png and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-36-white.png b/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-36-white.png
deleted file mode 100644
index 3f342cc..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/css/images/icons-36-white.png and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/css/style.css b/webcommon/web.client.samples/EaselDemo/public_html/css/style.css
deleted file mode 100644
index a4efba3..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/css/style.css
+++ /dev/null
@@ -1,157 +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.
- */
-
-.thumb {
- width: 150px;
- height: 150px;
-}
-
-.fancy {
- font-family: sans-serif;
- font-size: 16px;
- padding: 3px;
-}
-
-.restDetails {
- font-size: 16px;
- font-weight: bold;
- display:none;
- background: #333;
- color: white;
- border: 2px solid #ddd;
- padding: 10px;
- padding-bottom: 5px;
- position: relative;
- width: 250px;
- box-shadow: 0px 0px 20px #004ab3; /* CSS3 */
- -moz-box-shadow: 0px 0px 20px #004ab3; /* Firefox */
- -webkit-box-shadow: 0px 0px 20px #004ab3; /* Safari, Chrome */
- border-radius:15px 15px 15px 15px;
- -moz-border-radius: 15px; /* Firefox */
- -webkit-border-radius: 15px; /* Safari, Chrome */
-}
-
-/***************************
-* Start of popup CSS
-****************************/
-#mask {
- display: none;
- background: #999;
- position: fixed; left: 0; top: 0;
- z-index: 10;
- width: 100%; height: 100%;
- opacity: 0.8;
- z-index: 999;
-}
-
-img.avatar{
- width: 60px;
- height: 60px;
-}
-
-.tweet-popup{
- display:none;
- background: #333;
- padding: 10px;
- border: 2px solid #ddd;
- float: left;
- font-size: 1.2em;
- position: fixed;
- top: 50%; left: 50%;
- z-index: 99999;
- box-shadow: 0px 0px 20px #999; /* CSS3 */
- -moz-box-shadow: 0px 0px 20px #999; /* Firefox */
- -webkit-box-shadow: 0px 0px 20px #999; /* Safari, Chrome */
- border-radius:3px 3px 3px 3px;
- -moz-border-radius: 3px; /* Firefox */
- -webkit-border-radius: 3px; /* Safari, Chrome */
-}
-
-img.btn_close { /* Position the close button */
- float: right;
- margin: -28px -28px;
- opacity: 1.0;
-}
-
-fieldset {
- border:none;
-}
-
-form.signin .tweetbox label {
- display:block;
- padding-bottom:7px;
-}
-
-form.signin .tweetbox span {
- display:block;
-}
-
-form.signin p, form.signin span {
- color:#999;
- font-size:16px;
- line-height:18px;
- font-weight: bolder;
-}
-
-form.signin .tweetbox input {
- background:#666666;
- border-bottom:1px solid #333;
- border-left:1px solid #000;
- border-right:1px solid #333;
- border-top:1px solid #000;
- color:#fff;
- border-radius: 3px 3px 3px 3px;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- font:13px Arial, Helvetica, sans-serif;
- padding:6px 6px 4px;
- width:200px;
-}
-
-form.signin input:-moz-placeholder { color:#bbb; text-shadow:0 0 2px #000; }
-form.signin input::-webkit-input-placeholder { color:#bbb; text-shadow:0 0 2px #000; }
-
-.button {
- background: -moz-linear-gradient(center top, #f3f3f3, #dddddd);
- background: -webkit-gradient(linear, left top, left bottom, from(#f3f3f3), to(#dddddd));
- background: -o-linear-gradient(top, #f3f3f3, #dddddd);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#f3f3f3', EndColorStr='#dddddd');
- border-color:#000;
- border-width:1px;
- border-radius:4px 4px 4px 4px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- color:#333;
- cursor:pointer;
- display:inline-block;
- padding:6px 6px 4px;
- margin-top:10px;
- font:12px;
- width:214px;
-}
-.button:hover { background:#ddd; }
-
-#tweetText{
- color: #999 !important;
- font-size: 12px;
-}
-#dataSource{
- font-size: 0.7em;
- color: #999 !important;
-}
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/img/cute_rabbit1.jpg b/webcommon/web.client.samples/EaselDemo/public_html/img/cute_rabbit1.jpg
deleted file mode 100644
index 231e67a..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/img/cute_rabbit1.jpg and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/img/cute_rabbit2.jpg b/webcommon/web.client.samples/EaselDemo/public_html/img/cute_rabbit2.jpg
deleted file mode 100644
index c39e5fe..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/img/cute_rabbit2.jpg and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/img/cute_rabbit3.jpg b/webcommon/web.client.samples/EaselDemo/public_html/img/cute_rabbit3.jpg
deleted file mode 100644
index feef336..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/img/cute_rabbit3.jpg and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/img/glyphicons-halflings-white.png b/webcommon/web.client.samples/EaselDemo/public_html/img/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/img/glyphicons-halflings-white.png and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/img/glyphicons-halflings.png b/webcommon/web.client.samples/EaselDemo/public_html/img/glyphicons-halflings.png
deleted file mode 100644
index 79bc568..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/img/glyphicons-halflings.png and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/img/kitten1.jpg b/webcommon/web.client.samples/EaselDemo/public_html/img/kitten1.jpg
deleted file mode 100644
index 8936d99..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/img/kitten1.jpg and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/img/rabbit1.jpg b/webcommon/web.client.samples/EaselDemo/public_html/img/rabbit1.jpg
deleted file mode 100644
index f959ee5..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/img/rabbit1.jpg and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/img/rabbit2.jpg b/webcommon/web.client.samples/EaselDemo/public_html/img/rabbit2.jpg
deleted file mode 100644
index 912132f..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/img/rabbit2.jpg and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/img/rabbit3.jpg b/webcommon/web.client.samples/EaselDemo/public_html/img/rabbit3.jpg
deleted file mode 100644
index 4295a1f..0000000
Binary files a/webcommon/web.client.samples/EaselDemo/public_html/img/rabbit3.jpg and /dev/null differ
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/index.html b/webcommon/web.client.samples/EaselDemo/public_html/index.html
deleted file mode 100644
index a4d815d..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/index.html
+++ /dev/null
@@ -1,128 +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.
-
--->
-<!DOCTYPE html>
-<html>
- <head>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <script type="text/javascript" src="js/loadWelcome.js"></script>
- <script type="text/javascript">window.onload = getWelcome;</script>
-
- <!-- Le styles -->
- <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/css/bootstrap.css" type="text/css">
- <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/css/bootstrap-responsive.css" type="text/css"/>
- <link rel="stylesheet" href="css/style.css" type="text/css"/>
-
- <style type="text/css">
- body {
- padding-top: 60px;
- padding-bottom: 40px;
- }
- </style>
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <title>Project Easel Demo</title>
- </head>
- <body>
- <div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container-fluid">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="#">Project name</a>
- <div class="btn-group pull-right">
- <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
- <i class="icon-user"></i> Username
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li><a href="#">Profile</a></li>
- <li class="divider"></li>
- <li><a href="#">Sign Out</a></li>
- </ul>
- </div>
- <div class="nav-collapse">
- <ul class="nav">
- <li class="active"><a href="index.html">Home</a></li>
- <li><a href="about.html">About</a></li>
- <li><a href="tableui.html">Rest Client</a></li>
- <li><a href="#contact">Contact</a></li>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
- </div>
-
- <div class="container-fluid">
- <div class="row-fluid">
- <div class="span9">
- <div id="welcome" class="hero-unit">
- <!-- The content for this element is being set by
- the getWelcome() JS function during window.onload
- -->
- </div>
- <div class="row-fluid">
- <div class="span4">
- <img class="thumb" src="img/rabbit1.jpg" width="100" height="100"/>
- <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
- <p><a class="btn" href="#"> View details »</a></p>
- </div><!--/span-->
- <div class="span4">
- <img class="thumb" src="img/rabbit2.jpg" width="100" height="100"/><p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
- <p><a class="btn" href="#">View details »</a></p>
- </div><!--/span-->
- <div class="span4">
- <img class="thumb" src="img/rabbit3.jpg" width="100" height="100"/><p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
- <p><a class="btn" href="#">View details »</a></p>
- </div><!--/span-->
- </div><!--/row-->
- </div><!--/span-->
- </div><!--/row-->
-
- <!-- TODO Add Footer element here -->
-
-
- </div>
- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-transition.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-alert.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-modal.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-dropdown.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-scrollspy.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-tab.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-tooltip.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-popover.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-button.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-collapse.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-carousel.js"></script>
- <script src="//maxcdn.bootstrapcdn.com/bootstrap/2.0.4/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/js/about.js b/webcommon/web.client.samples/EaselDemo/public_html/js/about.js
deleted file mode 100644
index f17f3b6..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/js/about.js
+++ /dev/null
@@ -1,119 +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.
- */
-
-function loadRest() {
- url = "rest/resources/manufacturer.json";
- $.getJSON(url, function(data) {
- content = "<div id='restDataList'><table border=0><tr>";
- for (i = 0; i < 4; i++) {
- content += "<td><a id='listItem' onclick='showDetails(" + data[i].manufacturerId + ")' class='btn btn-primary'>" + data[i].name + " »</a></td></tr>";
- }
- content += "</table></div>";
- $("#rest").html(content);
- });
-}
-
-function showDetails(id) {
- url = "rest/resources/id" + id+".json";
- $.getJSON(url, function(data) {
- $("#restName").text(data.name);
- $("#restRep").text(data.rep);
- $("#restEmail").text(data.email);
- $("#restPhone").text(data.phone);
- });
- dataSwitch();
-}
-
-function dataSwitch() {
- $('#restDataList').toggle(700, 'easeOutExpo');
- $('#restDetails').toggle(700, 'easeOutExpo');
-}
-
-// This is the jQuery animation code
-$(document).ready(function() {
- $("#start").click(function() {
- $("#animation-div").animate({
- height:200,
- opacity: 0.0
- }, 500);
- $("#animation-div").animate({
- width:200,
- opacity: 1.0
- }, 500);
- $("#animation-div").animate({height:100}, 500);
- $("#animation-div").animate({width:100}, 500);
- });
-
- $('#switch').click(function() {
- $('#blue_div').toggle('slow', 'easeOutExpo');
- $('#red_div').toggle('slow', 'easeOutExpo');
- });
-
- /* Add extra jQuery examples here */
-
-});
-
-function loadWeather() {
- $.getJSON('http://api.openweathermap.org/data/2.5/find?q=Prague,cz&units=metric', function(data) {
- var result = data.list[0];
- $("#tweetImg").html("<img class='avatar' src='http://openweathermap.org/img/w/"+result.weather[0].icon+".png'/>");
-
- $("#tweetUsername").html(result.main.temp+" °C");
- $("#tweetUser").text("Current weather in Prague");
- $("#tweetText").html(result.weather[0].main+"<br/>Humidity: "+result.main.humidity+" %<br/>Max. temperature: "+result.main.temp_max+" °C<br/>Min. temperature: "+result.main.temp_min+" °C<br/>");
- });
-}
-
-// This is the Weather Popup code section
-$(document).ready(function() {
- $('a.tweet-window').click(function() {
-
- // Loading the data from a REST call
- loadWeather();
-
- //Getting the variable's value from a link
- var tweetBox = $(this).attr('href');
-
- //Fade in the Popup
- $(tweetBox).fadeIn(300);
-
- //Set the center alignment padding + border see css style
- var popMargTop = ($(tweetBox).height() + 24) / 2;
- var popMargLeft = ($(tweetBox).width() + 24) / 2;
-
- $(tweetBox).css({
- 'margin-top' : -popMargTop,
- 'margin-left' : -popMargLeft
- });
-
- // Add the mask to the body
- $('body').append('<div id="mask"></div>');
- $('#mask').fadeIn(300);
-
- return false;
- });
-
- // When clicking on the close button or the mask layer the popup is closed
- $('a.tweet-close, #mask').live('click', function() {
- $('#mask , .tweet-popup').fadeOut(300, function() {
- $('#mask').remove();
- });
- return false;
- });
-});
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/js/draganddrop.js b/webcommon/web.client.samples/EaselDemo/public_html/js/draganddrop.js
deleted file mode 100644
index 09c130a..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/js/draganddrop.js
+++ /dev/null
@@ -1,54 +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.
- */
-var orig_draganddrop="";
-var orig_div1 = "";
-var orig_rabbit1 = "";
-
-function allowDrop(ev)
-{
- ev.preventDefault();
-}
-
-function drag(ev)
-{
- ev.dataTransfer.setData("pets", ev.target.id);
-}
-
-function drop(ev)
-{
- orig_draganddrop = document.getElementById('DandD_div').innerHTML;
-
- ev.preventDefault();
- var data = ev.dataTransfer.getData("pets");
- ev.target.appendChild(document.getElementById(data));
- document.getElementById('drop1').setAttribute("src","img/cute_rabbit1.jpg");
- document.getElementById('drop1').setAttribute("width","300");
- document.getElementById('drop1').setAttribute("height","200");
-
- document.getElementById("div1").setAttribute('width',"300");
- document.getElementById("div1").setAttribute('height',"200");
-
- document.getElementById('draganddrop').innerHTML="Well, Hello There! <br/><a id='resetBtn' class='btn' onclick='reset()' href='#'>Reset</a>";
- document.getElementById('drag1').style.display='none';
-}
-
-function reset(){
- document.getElementById("DandD_div").innerHTML = orig_draganddrop;
-}
-
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/js/loadWelcome.js b/webcommon/web.client.samples/EaselDemo/public_html/js/loadWelcome.js
deleted file mode 100644
index 2485155..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/js/loadWelcome.js
+++ /dev/null
@@ -1,50 +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.
- */
-
-document.write('<scr'+'ipt type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.js" ></scr'+'ipt>');
-var lang;
-
-function getWelcome() {
- lang = getLanguage();
- if (!lang || !phrases[lang]) {
- lang = 'nl';
- }
- document.getElementById('welcome').innerHTML = phrases[lang];
-
-}
-
- function getLanguage() {
-
- if (navigator.language) {
- lang = navigator.language;
- } else if (navigator.userLanguage) {
- lang = navigator.userLanguage;
- }
-
- if (lang && lang.length > 2) {
- lang = lang.substring(0, 2);
- }
-
- return lang;
- }
-
-var phrases = { /* translation table for page */
- en: ["<h1>Welcome!</h1><p>NetBeans Project Easel is about combining state of the art HTML5/CSS3/JavaScript client development with Java/REST web services. Enabling the development and customization of flexabilble and performant industry standard client-side interfaces for multiple devices.</p><p><a href='about.html' class='btn btn-primary btn-large'>Learn more »</a></p>"],
- nl: ["<h1>Welkom!</h1><p>NetBeans Project Schildersezel gaat over een combinatie van state of the art HTML5/CSS3/JavaScript client ontwikkeling met Java / REST webservices. Het inschakelen van de ontwikkeling en aanpassing van flexabilble en performante industrie standaard client-side interfaces voor meerdere apparaten.</p><p><a href='about.html' class='btn btn-primary btn-large'> meer informatie »</a></p>"]
-};
\ No newline at end of file
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/rest/RestClient.js b/webcommon/web.client.samples/EaselDemo/public_html/rest/RestClient.js
deleted file mode 100644
index c4f72d5..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/rest/RestClient.js
+++ /dev/null
@@ -1,392 +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.
- */
-
-var app = {
- // Create this closure to contain the cached modules
- module: function() {
- // Internal module cache.
- var modules = {};
-
- // Create a new module reference scaffold or load an
- // existing module.
- return function(name) {
- // If this module has already been created, return it.
- if (modules[name]) {
- return modules[name];
- }
-
- // Create a module and save it under this name
- return modules[name] = {Views: {}};
- };
- }()
-};
-
-(function(models) {
-
-// Model for Manufacturer entity
- models.Manufacturer = Backbone.Model.extend({
- urlRoot: "rest/resources/manufacturer.json",
- idAttribute: 'manufacturerId',
- defaults: {
- addressline2: "",
- zip: "",
- phone: "",
- fax: "",
- addressline1: "",
- email: "",
- name: "",
- state: "",
- rep: "",
- city: ""
- },
- toViewJson: function() {
- var result = this.toJSON(); // displayName property is used to render item in the list
- result.displayName = this.get('name');
- return result;
- },
- isNew: function() {
- // default isNew() method imlementation is
- // based on the 'id' initialization which
- // sometimes is required to be initialized.
- // So isNew() is rediefined here
- return this.notSynced;
- },
- sync: function(method, model, options) {
- options || (options = {});
- var errorHandler = {
- error: function(jqXHR, textStatus, errorThrown) {
- // TODO: put your error handling code here
- // If you use the JS client from the different domain
- // (f.e. locally) then Cross-origin resource sharing
- // headers has to be set on the REST server side.
- // Otherwise the JS client has to be copied into the
- // some (f.e. the same) Web project on the same domain
- alert('Unable to fulfil the request. This is a sample application without server backend.');
- }}
-
- if (method == 'create') {
- options.url = 'rest/resources/manufacturer.json';
- }
- if (method == 'update') {
- options.url = 'rest/resources/manufacturer.json';
- }
- var result = Backbone.sync(method, model, _.extend(options, errorHandler));
- return result;
- }
-
-
- });
-
-
- // Collection class for Manufacturer entities
- models.ManufacturerCollection = Backbone.Collection.extend({
- model: models.Manufacturer,
- url: "rest/resources/manufacturer.json",
- sync: function(method, model, options) {
- options || (options = {});
- var errorHandler = {
- error: function(jqXHR, textStatus, errorThrown) {
- // TODO: put your error handling code here
- // If you use the JS client from the different domain
- // (f.e. locally) then Cross-origin resource sharing
- // headers has to be set on the REST server side.
- // Otherwise the JS client has to be copied into the
- // some (f.e. the same) Web project on the same domain
- alert('Unable to fulfil the request');
- }}
-
- var result = Backbone.sync(method, model, _.extend(options, errorHandler));
- return result;
- }
- });
-
-
-})(app.module("models"));
-
-(function(views) {
-
- views.ListView = Backbone.View.extend({
- tagName: 'tbody',
- initialize: function() {
-
- this.model.bind("reset", this.render, this);
- var self = this;
- this.model.bind("add", function(modelName) {
- var row = new views.ListItemView({
- model: modelName,
- templateName: self.options.templateName
- }).render().el;
- $(self.el).append($(row));
- $(self.el).parent().trigger('addRows', [$(row)]);
- });
- },
- render: function(eventName) {
- var self = this;
- _.each(this.model.models, function(modelName) {
- $(this.el).append(new views.ListItemView({
- model: modelName,
- templateName: self.options.templateName
- }).render().el);
- }, this);
- return this;
- }
- });
-
- views.ListItemView = Backbone.View.extend({
- tagName: 'tr',
- initialize: function() {
- this.model.bind("change", this.render, this);
- this.model.bind("destroy", this.close, this);
- },
- template: function(json) {
- /*
- * templateName is element identifier in HTML
- * $(this.options.templateName) is element access to the element
- * using jQuery
- */
- return _.template($(this.options.templateName).html())(json);
- },
- render: function(eventName) {
- $(this.el).html(this.template(this.model.toJSON()));
- return this;
- },
- close: function() {
- var table = $(this.el).parent().parent();
- table.trigger('disable.pager');
- $(this.el).unbind();
- $(this.el).remove();
- table.trigger('enable.pager');
- }
-
- });
-
- views.ModelView = Backbone.View.extend({
- initialize: function() {
- this.model.bind("change", this.render, this);
- },
- render: function(eventName) {
- $(this.el).html(this.template(this.model.toJSON()));
- return this;
- },
- template: function(json) {
- /*
- * templateName is element identifier in HTML
- * $(this.options.templateName) is element access to the element
- * using jQuery
- */
- return _.template($(this.options.templateName).html())(json);
- },
- /*
- * Classes "save" and "delete" are used on the HTML controls to listen events.
- * So it is supposed that HTML has controls with these classes.
- */
- events: {
- "change input": "change",
- "click .save": "save",
- "click .delete": "drop"
- },
- change: function(event) {
- var target = event.target;
- console.log('changing ' + target.id + ' from: ' + target.defaultValue + ' to: ' + target.value);
- },
- save: function() {
- // TODO : put save code here
- var hash = this.options.getHashObject();
- this.model.set(hash);
- if (this.model.isNew() && this.collection) {
- var self = this;
- this.collection.create(this.model, {
- success: function() {
- // see isNew() method implementation in the model
- self.model.notSynced = false;
- self.options.navigate(self.model.id);
- }
- });
- } else {
- this.model.save();
- this.model.el.parent().parent().trigger("update");
- }
- return false;
- },
- drop: function() {
- this.model.destroy({
- success: function() {
- /*
- * TODO : put your code here
- * f.e. alert("Model is successfully deleted");
- */
- window.history.back();
- }
- });
- return false;
- },
- close: function() {
- $(this.el).unbind();
- $(this.el).empty();
- }
- });
-
- // This view is used to create new model element
- views.CreateView = Backbone.View.extend({
- initialize: function() {
- this.render();
- },
- render: function(eventName) {
- $(this.el).html(this.template());
- return this;
- },
- template: function(json) {
- /*
- * templateName is element identifier in HTML
- * $(this.options.templateName) is element access to the element
- * using jQuery
- */
- return _.template($(this.options.templateName).html())(json);
- },
- /*
- * Class "new" is used on the control to listen events.
- * So it is supposed that HTML has a control with "new" class.
- */
- events: {
- "click .new": "create"
- },
- create: function(event) {
- this.options.navigate();
- return false;
- }
- });
-
-})(app.module("views"));
-
-
-$(function() {
- var models = app.module("models");
- var views = app.module("views");
-
- var AppRouter = Backbone.Router.extend({
- routes: {
- '': 'list',
- 'new': 'create'
- ,
- ':id': 'details'
- },
- initialize: function() {
- var self = this;
- $('#create').html(new views.CreateView({
- // tpl-create is template identifier for 'create' block
- templateName: '#tpl-create',
- navigate: function() {
- self.navigate('new', true);
- }
- }).render().el);
- },
- list: function() {
- this.collection = new models.ManufacturerCollection();
- var self = this;
- this.collection.fetch({
- success: function() {
- self.listView = new views.ListView({
- model: self.collection,
- // tpl-manufacturer-list-itemis template identifier for item
- templateName: '#tpl-manufacturer-list-item'
- });
- $('#datatable').html(self.listView.render().el).append(_.template($('#thead').html())());
- if (self.requestedId) {
- self.details(self.requestedId);
- }
- var pagerOptions = {
- // target the pager markup
- container: $('.pager'),
- // output string - default is '{page}/{totalPages}'; possiblevariables: {page}, {totalPages},{startRow}, {endRow} and {totalRows}
- output: '{startRow} to {endRow} ({totalRows})',
- // starting page of the pager (zero based index)
- page: 0,
- // Number of visible rows - default is 10
- size: 10
- };
- $('#datatable').tablesorter({widthFixed: true,
- widgets: ['zebra']}).
- tablesorterPager(pagerOptions);
- }
- });
- },
- details: function(id) {
- if (this.collection) {
- this.manufacturer = this.collection.get(id);
- if (this.view) {
- this.view.close();
- }
- var self = this;
- this.view = new views.ModelView({
- model: this.manufacturer,
- // tpl-manufacturer-details is template identifier for chosen model element
- templateName: '#tpl-manufacturer-details',
- getHashObject: function() {
- return self.getData();
- }
- });
- $('#details').html(this.view.render().el);
- } else {
- this.requestedId = id;
- this.list();
- }
- },
- create: function() {
- if (this.view) {
- this.view.close();
- }
- var self = this;
- var dataModel = new models.Manufacturer();
- // see isNew() method implementation in the model
- dataModel.notSynced = true;
- this.view = new views.ModelView({
- model: dataModel,
- collection: this.collection,
- // tpl-manufacturer-details is a template identifier for chosen model element
- templateName: '#tpl-manufacturer-details',
- navigate: function(id) {
- self.navigate(id, false);
- },
- getHashObject: function() {
- return self.getData();
- }
- });
- $('#details').html(this.view.render().el);
- },
- getData: function() {
- return {
- manufacturerId: $('#manufacturerId').val(),
- addressline2: $('#addressline2').val(),
- zip: $('#zip').val(),
- phone: $('#phone').val(),
- addressline1: $('#addressline1').val(),
- fax: $('#fax').val(),
- email: $('#email').val(),
- name: $('#name').val(),
- state: $('#state').val(),
- city: $('#city').val(),
- rep: $('#rep').val()
- };
- }
- });
- new AppRouter();
-
-
- Backbone.history.start();
-});
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19974892.json b/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19974892.json
deleted file mode 100644
index 1bd57dc..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19974892.json
+++ /dev/null
@@ -1 +0,0 @@
-{"manufacturerId":19974892,"name":"Wilson Fish Co","addressline1":"20959 Whalers Ave","addressline2":"Building 3","city":"San Jose","state":"OH","zip":"95128","phone":"650-555-0133","fax":"408-555-0133","email":"www.wilsonfish@example.com","rep":"Matthew Williams"}
\ No newline at end of file
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19985678.json b/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19985678.json
deleted file mode 100644
index 870e6b5..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19985678.json
+++ /dev/null
@@ -1 +0,0 @@
-{"manufacturerId":19985678,"name":"Happy End Searching","addressline1":"5 81st Street","addressline2":"Suite 100","city":"Mountain View","state":"CA","zip":"94043","phone":"650-555-0102","fax":"408-555-0103","email":"happysearching@example.com","rep":"John Snow"}
\ No newline at end of file
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19986196.json b/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19986196.json
deleted file mode 100644
index b48d164..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19986196.json
+++ /dev/null
@@ -1 +0,0 @@
-{"manufacturerId":19986196,"name":"James Deli","addressline1":"250 Marinade Blvd","addressline2":"Suite C","city":"Novato","state":"IL","zip":"94949","phone":"650-555-0144","fax":"408-555-0145","email":"www.jdeli@example.net","rep":"Phil Jones"}
\ No newline at end of file
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19986982.json b/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19986982.json
deleted file mode 100644
index d7dc107..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/id19986982.json
+++ /dev/null
@@ -1 +0,0 @@
-{"manufacturerId":19986982,"name":"Smith Bird Watching","addressline1":"4000 Finch Circle","addressline2":"Building 14","city":"Santa Clara","state":"CA","zip":"95051","phone":"650-555-0111","fax":"408-555-0112","email":"www.sbw@example.com","rep":"Brian Washington"}
\ No newline at end of file
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/manufacturer.json b/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/manufacturer.json
deleted file mode 100644
index c6339b7..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/rest/resources/manufacturer.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"manufacturerId":19985678,"name":"Happy End Searching","addressline1":"5 81st Street","addressline2":"Suite 100","city":"Mountain View","state":"CA","zip":"94043","phone":"650-555-0102","fax":"408-555-0103","email":"happysearching@example.com","rep":"John Snow"},{"manufacturerId":19986982,"name":"Smith Bird Watching","addressline1":"4000 Finch Circle","addressline2":"Building 14","city":"Santa Clara","state":"CA","zip":"95051","phone":"650-555-0111","fax":"408-555-0112","email":"www.sb [...]
\ No newline at end of file
diff --git a/webcommon/web.client.samples/EaselDemo/public_html/tableui.html b/webcommon/web.client.samples/EaselDemo/public_html/tableui.html
deleted file mode 100644
index fa0f3ed..0000000
--- a/webcommon/web.client.samples/EaselDemo/public_html/tableui.html
+++ /dev/null
@@ -1,138 +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.
-
--->
-<!DOCTYPE html>
-<html>
- <head>
- <title></title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <link rel='stylesheet' href='//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.26.2/css/theme.blue.min.css'>
- <link rel='stylesheet' href='//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.26.2/css/jquery.tablesorter.pager.min.css'>
- <script src='//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js'></script>
- <script src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'></script>
- <script src='//ajax.cdnjs.com/ajax/libs/backbone.js/0.9.2/backbone-min.js'></script>
- <script src='//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.26.2/js/jquery.tablesorter.min.js' type="text/javascript"></script>
- <script src='//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.26.2/js/extras/jquery.tablesorter.pager.min.js' type="text/javascript"></script>
- <script src='rest/RestClient.js'></script>
- </head>
- <body>
- <div id='create'></div>
-
- <table id='datatable' class='tablesorter-blue'>
- </table>
- <div class='pager' id='pager'>
- <img src='//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.26.2/css/images/first.png' class='first' alt='First'/>
- <img src='//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.26.2/css/images/prev.png' class='prev' alt='Prev'/>
- <span class='pagedisplay'></span> <!-- this can be any element, including an input -->
- <img src='//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.26.2/css/images/next.png' class='next' alt='Next'/>
- <img src='//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.26.2/css/images/last.png' class='last' alt='Last'/>
- <select class='pagesize'>
- <option selected='selected' value='10'>10</option>
- <option value='20'>20</option>
- <option value='30'>30</option>
- <option value='40'>40</option>
- </select>
- </div>
- <br>
-
- <div id='details'></div>
-
-
- <!-- Templates -->
- <script type='text/template' id='tpl-create'>
- <!--
- Put your controls to create new entity here.
-
- Class 'new' is used to listen on events in JS code.
- -->
- <button class='new'>Create</button>
- </script>
-
- <script type='text/template' id='thead'>
- <thead><th>manufacturerId</th>
- <th>addressline2</th>
- <th>zip</th>
- <th>phone</th>
- <th>addressline1</th>
- <th>fax</th>
- <th>email</th>
- <th>name</th>
- <th>state</th>
- <th>city</th>
- <th>rep</th>
- </thead>
-</script>
-<script type='text/template' id='tpl-manufacturer-list-item'>
- <td><a href='#<%= manufacturerId %>'><%= manufacturerId %></a></td>
- <td><%= addressline2 %></td>
- <td><%= zip %></td>
- <td><%= phone %></td>
- <td><%= addressline1 %></td>
- <td><%= fax %></td>
- <td><%= email %></td>
- <td><%= name %></td>
- <td><%= state %></td>
- <td><%= city %></td>
- <td><%= rep %></td>
-</script>
-
-<script type='text/template' id='tpl-manufacturer-details'>
- <div>
- <table>
- <tbody>
- <tr><td>Id</td>
- <td>
- <input type='text' id='manufacturerId' name='id' value='<%= typeof(manufacturerId)!== "undefined" ? manufacturerId : "" %>' />
- </td>
- </tr>
- <tr>
- <td>addressline2</td><td><input type='text' id='addressline2' name='addressline2' value='<%= addressline2 %>'/></td></tr>
- <tr>
- <td>zip</td><td><input type='text' id='zip' name='zip' value='<%= zip %>'/></td></tr>
- <tr>
- <td>phone</td><td><input type='text' id='phone' name='phone' value='<%= phone %>'/></td></tr>
- <tr>
- <td>addressline1</td><td><input type='text' id='addressline1' name='addressline1' value='<%= addressline1 %>'/></td></tr>
- <tr>
- <td>fax</td><td><input type='text' id='fax' name='fax' value='<%= fax %>'/></td></tr>
- <tr>
- <td>email</td><td><input type='text' id='email' name='email' value='<%= email %>'/></td></tr>
- <tr>
- <td>name</td><td><input type='text' id='name' name='name' value='<%= name %>'/></td></tr>
- <tr>
- <td>state</td><td><input type='text' id='state' name='state' value='<%= state %>'/></td></tr>
- <tr>
- <td>city</td><td><input type='text' id='city' name='city' value='<%= city %>'/></td></tr>
- <tr>
- <td>rep</td><td><input type='text' id='rep' name='rep' value='<%= rep %>'/></td></tr>
- </tbody>
- </table>
- <!--
- Put your controls to create new entity here.
- Classes 'save' and 'delete' are used to listen on events in JS code.
- -->
- <button class='save'>Save</button>
- <button class='delete'>Delete</button>
- </div>
-</script>
-
-
-</body>
-</html>
diff --git a/webcommon/web.client.samples/build.xml b/webcommon/web.client.samples/build.xml
index b66fdb7..438874a 100644
--- a/webcommon/web.client.samples/build.xml
+++ b/webcommon/web.client.samples/build.xml
@@ -22,12 +22,4 @@
<project basedir="." default="build" name="webcommon/web.client.samples">
<description>Builds, tests, and runs the project org.netbeans.modules.web.client.samples</description>
<import file="../../nbbuild/templates/projectized.xml"/>
-
- <target name="jar" depends="zip-examples,projectized-common.jar"/>
-
- <target name="zip-examples" depends="compile">
- <property name="examples" value="${build.classes.dir}/org/netbeans/modules/web/client/samples"/>
- <mkdir dir="EaselDemo/test"/>
- <zip basedir="EaselDemo" destfile="${examples}/Easel.zip"/>
- </target>
</project>
diff --git a/webcommon/web.client.samples/licenseinfo.xml b/webcommon/web.client.samples/licenseinfo.xml
index 5f4a50e..8445744 100644
--- a/webcommon/web.client.samples/licenseinfo.xml
+++ b/webcommon/web.client.samples/licenseinfo.xml
@@ -21,27 +21,7 @@
-->
<licenseinfo>
<fileset>
- <file>EaselDemo/public_html/rest/resources/id19974892.json</file>
- <file>EaselDemo/public_html/rest/resources/id19985678.json</file>
- <file>EaselDemo/public_html/rest/resources/id19986196.json</file>
- <file>EaselDemo/public_html/rest/resources/id19986982.json</file>
- <file>EaselDemo/public_html/rest/resources/manufacturer.json</file>
<file>src/org/netbeans/modules/web/client/samples/resources/HTML5_project_icon.png</file>
- <file>EaselDemo/public_html/css/images/icons-18-white.png</file>
- <file>EaselDemo/public_html/css/images/close_pop.png</file>
- <file>EaselDemo/public_html/css/images/icons-18-black.png</file>
- <file>EaselDemo/public_html/css/images/ajax-loader.png</file>
- <file>EaselDemo/public_html/css/images/icons-36-black.png</file>
- <file>EaselDemo/public_html/css/images/icons-36-white.png</file>
- <file>EaselDemo/public_html/img/cute_rabbit2.jpg</file>
- <file>EaselDemo/public_html/img/glyphicons-halflings.png</file>
- <file>EaselDemo/public_html/img/rabbit2.jpg</file>
- <file>EaselDemo/public_html/img/rabbit1.jpg</file>
- <file>EaselDemo/public_html/img/kitten1.jpg</file>
- <file>EaselDemo/public_html/img/rabbit3.jpg</file>
- <file>EaselDemo/public_html/img/cute_rabbit1.jpg</file>
- <file>EaselDemo/public_html/img/glyphicons-halflings-white.png</file>
- <file>EaselDemo/public_html/img/cute_rabbit3.jpg</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
diff --git a/webcommon/web.client.samples/src/org/netbeans/modules/web/client/samples/layer.xml b/webcommon/web.client.samples/src/org/netbeans/modules/web/client/samples/layer.xml
index 280c2c7..065d47c 100644
--- a/webcommon/web.client.samples/src/org/netbeans/modules/web/client/samples/layer.xml
+++ b/webcommon/web.client.samples/src/org/netbeans/modules/web/client/samples/layer.xml
@@ -27,14 +27,6 @@
<folder name="HTML5">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.web.client.samples.wizard.ui.Bundle"/>
<attr name="position" intvalue="210"/>
- <file name="ResponsiveRabbits" url="Easel.zip">
- <attr name="displayName" bundlevalue="org.netbeans.modules.web.client.samples.wizard.ui.Bundle#Templates/Project/Samples/HTML5/ResponsiveRabbits"/>
- <attr name="position" intvalue="100"/>
- <attr name="iconBase" stringvalue="org/netbeans/modules/web/client/samples/resources/HTML5_project_icon.png"/>
- <attr name="instantiatingIterator" newvalue="org.netbeans.modules.web.client.samples.wizard.iterator.SampleWizardIterator"/>
- <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/web/client/samples/resources/ResponsiveRabbits.html"/>
- <attr name="template" boolvalue="true"/>
- </file>
</folder>
</folder>
</folder>
diff --git a/webcommon/web.client.samples/src/org/netbeans/modules/web/client/samples/wizard/ui/Bundle.properties b/webcommon/web.client.samples/src/org/netbeans/modules/web/client/samples/wizard/ui/Bundle.properties
index be2f343..07fdb3c 100644
--- a/webcommon/web.client.samples/src/org/netbeans/modules/web/client/samples/wizard/ui/Bundle.properties
+++ b/webcommon/web.client.samples/src/org/netbeans/modules/web/client/samples/wizard/ui/Bundle.properties
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
Templates/Project/Samples/HTML5=HTML5/JavaScript
-Templates/Project/Samples/HTML5/ResponsiveRabbits=Responsive Rabbits
LBL_ProjectLocation=Project &Location:
LBL_ProjectName=Project &Name:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists