You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by hn...@apache.org on 2010/09/24 15:57:54 UTC
svn commit: r1000871 - in
/shindig/trunk/content/samplecontainer/examples/media: Media.xml MediaUI.js
Social.js document.png folder.png styles.css
Author: hnguy
Date: Fri Sep 24 13:57:53 2010
New Revision: 1000871
URL: http://svn.apache.org/viewvc?rev=1000871&view=rev
Log:
SHINDIG-1430 - Patch from Eric Woods - Update license for Media Sample Gadget
Removed:
shindig/trunk/content/samplecontainer/examples/media/document.png
shindig/trunk/content/samplecontainer/examples/media/folder.png
Modified:
shindig/trunk/content/samplecontainer/examples/media/Media.xml
shindig/trunk/content/samplecontainer/examples/media/MediaUI.js
shindig/trunk/content/samplecontainer/examples/media/Social.js
shindig/trunk/content/samplecontainer/examples/media/styles.css
Modified: shindig/trunk/content/samplecontainer/examples/media/Media.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/media/Media.xml?rev=1000871&r1=1000870&r2=1000871&view=diff
==============================================================================
--- shindig/trunk/content/samplecontainer/examples/media/Media.xml (original)
+++ shindig/trunk/content/samplecontainer/examples/media/Media.xml Fri Sep 24 13:57:53 2010
@@ -1,4 +1,22 @@
<?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.
+-->
<Module>
<ModulePrefs title="Albums and MediaItems">
<Require feature="osapi"/>
Modified: shindig/trunk/content/samplecontainer/examples/media/MediaUI.js
URL: http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/media/MediaUI.js?rev=1000871&r1=1000870&r2=1000871&view=diff
==============================================================================
--- shindig/trunk/content/samplecontainer/examples/media/MediaUI.js (original)
+++ shindig/trunk/content/samplecontainer/examples/media/MediaUI.js Fri Sep 24 13:57:53 2010
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
+
/*
* The User Interface for the Albums & MediaItems gadget.
*
@@ -15,7 +33,10 @@
function MediaUI(social) {
var viewer = null;
var divManager = null;
-
+
+ var folderUrl = "http://www.clker.com/cliparts/2/b/b/3/1194983972976950993blue_folder_seth_yastrov_01.svg.med.png";
+ var docUrl = "http://www.plastyc.com/images/document-icon.png";
+
/*
* Initializes the gadget.
*/
@@ -118,7 +139,7 @@ function MediaUI(social) {
var albumRow = dojo.create('tr', null, tbody);
var albumLeft = dojo.create('td', {className: 'albumListThumbnail'}, albumRow);
var imgLink = dojo.create('a', {href: "javascript:;", onclick: dojo.hitch(this, onClickAlbum, viewer.id, albums[i])}, albumLeft);
- dojo.create('img', {src: albums[i].thumbnailUrl, onerror: "this.src='/samplecontainer/examples/media/folder.png';", width: '100%'}, imgLink);
+ dojo.create('img', {src: albums[i].thumbnailUrl, onerror: "this.src='" + folderUrl + "';", width: '100%'}, imgLink);
var albumRight = dojo.create('td', {className: 'albumListRight'}, albumRow);
var albumTitleRow = dojo.create('tr', null, albumRight);
var titleTd = dojo.create('td', {className: 'albumListTitle'}, albumTitleRow);
@@ -197,9 +218,9 @@ function MediaUI(social) {
var imageTd = dojo.create('tr', null, td).appendChild(dojo.create('td', {className: 'mediaItemThumbnail'}));
if (mediaItems[i].url) {
var imageLink = dojo.create('a', {href: "javascript:;", onclick: dojo.hitch(this, renderMediaItem, album, mediaItems[i])}, imageTd);
- imageLink.appendChild(dojo.create('img', {src: mediaItems[i].thumbnailUrl, onerror: "this.src='/samplecontainer/examples/media/document.png';", style:'height:100px;'}));
+ imageLink.appendChild(dojo.create('img', {src: mediaItems[i].thumbnailUrl, onerror: "this.src='" + docUrl + "';", style:'height:100px;'}));
} else {
- dojo.create('img', {src: mediaItems[i].thumbnailUrl, onerror: "this.src='/samplecontainer/examples/media/document.png';", style:'height:100px;'}, imageTd);
+ dojo.create('img', {src: mediaItems[i].thumbnailUrl, onerror: "this.src='" + docUrl + "';", style:'height:100px;'}, imageTd);
}
var titleTd = dojo.create('tr', null, td).appendChild(dojo.create('td', {style: "text-align:center; font-family:'comic sans ms';white-space:nowrap;"}));
titleTd.appendChild(dojo.doc.createTextNode(mediaItems[i].title));
Modified: shindig/trunk/content/samplecontainer/examples/media/Social.js
URL: http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/media/Social.js?rev=1000871&r1=1000870&r2=1000871&view=diff
==============================================================================
--- shindig/trunk/content/samplecontainer/examples/media/Social.js (original)
+++ shindig/trunk/content/samplecontainer/examples/media/Social.js Fri Sep 24 13:57:53 2010
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
+
/*
* Defines high level functionality to interact with the OpenSocial API.
*/
Modified: shindig/trunk/content/samplecontainer/examples/media/styles.css
URL: http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/media/styles.css?rev=1000871&r1=1000870&r2=1000871&view=diff
==============================================================================
--- shindig/trunk/content/samplecontainer/examples/media/styles.css (original)
+++ shindig/trunk/content/samplecontainer/examples/media/styles.css Fri Sep 24 13:57:53 2010
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
+
/* ============ ROUND 2 ============== */
td.albumsTitle {