OFBiz › OFBiz - Commits

svn commit: r422862 - /incubator/ofbiz/trunk/applications/content/webapp/content/cms/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jacopoc

svn commit: r422862 - /incubator/ofbiz/trunk/applications/content/webapp/content/cms/

Author: jacopoc
Date: Mon Jul 17 13:51:21 2006
New Revision: 422862

URL: http://svn.apache.org/viewvc?rev=422862&view=rev
Log:
License change from MIT to ASL2.0 for the files of the content component.
Thanks to Scott Gray for the patch (Apache OFBIZ-87).

Modified:
incubator/ofbiz/trunk/applications/content/webapp/content/cms/AdminIndex.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentFind.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSEditContentPurposeOperation.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml
incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/cms/EditAddContent.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/cms/EditAddImage.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/cms/UserPermissions.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/cms/addSubSite.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/cms/cms_menu.ftl
incubator/ofbiz/trunk/applications/content/webapp/content/cms/publishlib.ftl

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/AdminIndex.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/AdminIndex.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/AdminIndex.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/AdminIndex.ftl Mon Jul 17 13:51:21 2006
@@ -1,5 +1,21 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
${menuWrapper.renderMenuString()}
<hr/>
${singleWrapper.renderFormString()}
<hr/>
${singleWrapper2.renderFormString()}
+
\ No newline at end of file

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl Mon Jul 17 13:51:21 2006
@@ -1,3 +1,18 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
<hr/>
<form method="post" action="/content/control/AdminSearch" name="searchQuery" style="margin: 0;">
<table border="0" cellpadding="2" cellspacing="0">

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl Mon Jul 17 13:51:21 2006
@@ -1,27 +1,17 @@
<#--
- * Copyright (c) 2004 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Al Byers ([hidden email])
- *@version $Rev$
- *@since 2.1
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
-->

@@ -351,4 +341,3 @@
</@loopSubContentCache >

</#macro>
-

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentFind.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentFind.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentFind.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentFind.ftl Mon Jul 17 13:51:21 2006
@@ -1,5 +1,19 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
${menuWrapper.renderMenuString()}
${singleWrapper.renderFormString()}
<hr/>
${listWrapper.renderFormString()}
-

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSEditContentPurposeOperation.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSEditContentPurposeOperation.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSEditContentPurposeOperation.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSEditContentPurposeOperation.ftl Mon Jul 17 13:51:21 2006
@@ -1,4 +1,18 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation

+Licensed 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.
+-->
${listWrapper.renderFormString()}
<hr/>

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Mon Jul 17 13:51:21 2006
@@ -1,24 +1,18 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>


<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml Mon Jul 17 13:51:21 2006
@@ -1,24 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>


<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl Mon Jul 17 13:51:21 2006
@@ -1,4 +1,18 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation

+Licensed 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.
+-->
<SCRIPT language="javascript">
function call_fieldlookup4(rootForumId, parentForumId ) {
var obj_lookupwindow = window.open("addSubSite?rootForumId=" + rootForumId + "&parentForumId=" + parentForumId, 'FieldLookup', 'width=500,height=250,scrollbars=yes,status=no,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
@@ -260,4 +274,3 @@
</script>

</#macro>
-

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/EditAddContent.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/EditAddContent.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/EditAddContent.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/EditAddContent.ftl Mon Jul 17 13:51:21 2006
@@ -1,2 +1,16 @@
-${singleWrapper.renderFormString()}
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
+${singleWrapper.renderFormString()}

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/EditAddImage.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/EditAddImage.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/EditAddImage.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/EditAddImage.ftl Mon Jul 17 13:51:21 2006
@@ -1,2 +1,16 @@
- ${singleWrapper.renderFormString()}
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
+ ${singleWrapper.renderFormString()}

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/UserPermissions.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/UserPermissions.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/UserPermissions.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/UserPermissions.ftl Mon Jul 17 13:51:21 2006
@@ -1,3 +1,18 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
<script language="javascript1.2">
function call_fieldlookup3(view_name) {
var webSitePublishPoint = document.userform.webSitePublishPoint.value;

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/addSubSite.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/addSubSite.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/addSubSite.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/addSubSite.ftl Mon Jul 17 13:51:21 2006
@@ -1,3 +1,18 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
<script language="javascript1.2">
function submit_add() {
window.close();

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/cms_menu.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/cms_menu.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/cms_menu.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/cms_menu.ftl Mon Jul 17 13:51:21 2006
@@ -1 +1,16 @@
-
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
+
\ No newline at end of file

Modified: incubator/ofbiz/trunk/applications/content/webapp/content/cms/publishlib.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/webapp/content/cms/publishlib.ftl?rev=422862&r1=422861&r2=422862&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/content/webapp/content/cms/publishlib.ftl (original)
+++ incubator/ofbiz/trunk/applications/content/webapp/content/cms/publishlib.ftl Mon Jul 17 13:51:21 2006
@@ -1,3 +1,18 @@
+<#--
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed 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.
+-->
<#macro renderPublishLinks pubPtList contentId formAction="/updatePublishLinks" displayMode="view">
<#if displayMode=="edit">
<form mode="POST" name="form_publish" action="<@ofbizUrl>${formAction}</@ofbizUrl>" >
@@ -296,4 +311,3 @@
</script>

</#macro>
-