[pLog-svn] r2027 - in plog/branches/plog-1.0.1: js/htmlarea
templates/admin
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Fri May 20 07:45:20 GMT 2005
Author: oscar
Date: 2005-05-20 07:45:19 +0000 (Fri, 20 May 2005)
New Revision: 2027
Modified:
plog/branches/plog-1.0.1/js/htmlarea/htmlarea-plog-resourcelist.js
plog/branches/plog-1.0.1/templates/admin/resourcelist.template
Log:
added a mime type for those resources added via the "add resource" pop-up window in the interface
Modified: plog/branches/plog-1.0.1/js/htmlarea/htmlarea-plog-resourcelist.js
===================================================================
--- plog/branches/plog-1.0.1/js/htmlarea/htmlarea-plog-resourcelist.js 2005-05-20 07:18:23 UTC (rev 2026)
+++ plog/branches/plog-1.0.1/js/htmlarea/htmlarea-plog-resourcelist.js 2005-05-20 07:45:19 UTC (rev 2027)
@@ -1,141 +1,142 @@
-function _generateBaseLink( dest, blogId, type, resourceName, resourceDesc, preview )
-{
- if( type == 2 ) {
- if( preview == 1 ) {
- htmlCode = plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'&mode=preview';
+function _generateBaseLink( dest, blogId, type, resourceName, resourceDesc, preview )
+{
+ if( type == 2 ) {
+ if( preview == 1 ) {
+ htmlCode = plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'&mode=preview';
}
else if( preview == 2) {
htmlCode = plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'&mode=medium';
- }
- else {
- htmlCode = plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName);
- }
- }
- else {
- // if not an image, there is not much we can do
- htmlCode = '<a title="'+resourceDesc+'" href="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'">test</a>';
- }
-
- return htmlCode;
-}
-
-function _generateResourceLink( dest, blogId, type, resourceName, resourceDesc, preview )
-{
- var htmlCode = '';
- if( type == 1 ) {
- // if the resource is an image, check the second parameter to see wether we'd like
- // to show the preview with a link to the real size image or the real image
- // inlined with the text
- if( preview == 1 ) {
- htmlCode = '<a href="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'">';
- htmlCode += '<img style="margin: 5px;" border="0" alt="'+resourceDesc+'" src="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'&mode=preview" />';
- htmlCode += '</a>';
+ }
+ else {
+ htmlCode = plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName);
}
+ }
+ else {
+ // if not an image, there is not much we can do
+ htmlCode = '<a title="'+resourceDesc+'" href="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'">test</a>';
+ }
+
+ return htmlCode;
+}
+
+function _generateResourceLink( dest, blogId, type, resourceName, resourceDesc, preview, mimeType )
+{
+ window.alert('mimetype = ' + mimeType);
+ var htmlCode = '';
+ if( type == 1 ) {
+ // if the resource is an image, check the second parameter to see wether we'd like
+ // to show the preview with a link to the real size image or the real image
+ // inlined with the text
+ if( preview == 1 ) {
+ htmlCode = '<a href="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'" type="'+mimeType+'">';
+ htmlCode += '<img style="margin: 5px;" border="0" alt="'+resourceDesc+'" src="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'&mode=preview" />';
+ htmlCode += '</a>';
+ }
else if ( preview == 2 ) {
- htmlCode = '<a href="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'">';
- htmlCode += '<img style="margin: 5px;" border="0" alt="'+resourceDesc+'" src="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'&mode=medium" />';
- htmlCode += '</a>';
- }
- else {
- htmlCode = '<img style="margin: 5px;" alt="'+resourceDesc+'" src="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'" />';
- }
- }
- else {
- // if not an image, there is not much we can do
- htmlCode = '<a title="'+resourceDesc+'" href="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'">test</a>';
- }
-
- return htmlCode;
-
-}
-
-function addResourceLink( dest, reqFormat, blogId, type, resourceName, resourceDesc, preview )
-{
- // generate the link
- var htmlCode = _generateResourceLink( dest, reqFormat, blogId, type, resourceName, resourceDesc, preview );
-
- // and now send the value to the text area where we are typing the post
- if( dest == 1 ) {
- //parent.opener.document.newPost.postText.value += htmlCode;
- addText( parent.opener.document.newPost.postText, htmlCode );
- }
- else {
- //parent.opener.document.newPost.postExtendedText.value += htmlCode;
- addText( parent.opener.document.newPost.postExtendedText, htmlCode );
- }
-
- // finally close this window since we don't need it anymore
- //window.close();
-}
-
-function _generateAlbumLink( dest, blogId, albumId, albumName, albumDesc )
-{
- var htmlCode = '';
-
- // if no other global variable called 'indexPage' is defined, use the
- // default one
- if( indexPage == '' )
- indexPage = 'index.php';
-
- htmlCode = '<a title="'+albumDesc+'" href="'+plogBaseUrl+'/index.php?op=ViewAlbum&blogId='+blogId+'&albumId='+albumId+'">'+albumName+'</a>';
-
- return htmlCode;
-}
-
-/**
- * generates and adds a link to an album to the textarea
- *
- * @param dest
- * @param blogId
- * @param albumId
- * @param albumName
- * @param albumDesc
- */
-function addAlbumLink( dest, blogId, albumId, albumName, albumDesc )
-{
- albumLink = _generateAlbumLink( dest, blogId, albumId, albumName, albumDesc );
-
- // and now send the value to the text area where we are typing the post
- if( dest == 1 ) {
- addText( parent.opener.document.newPost.postText, albumLink );
- }
- else {
- addText( parent.opener.document.newPost.postExtendedText, albumLink );
- }
-}
-
-// ------
-//
-// htmlarea-related code
-//
-// -------
-//
-
-function resourceListWindowInit(htmlarea) {
- // if we use this method, the dialog will be resized to its full size and I don't like that...
- if( htmlarea ) {
- __dlg_init();
- window.resizeTo(450,600);
- }
-}
-
-function addHtmlareaLink(dest, blogId, type, resourceName, resourceDesc, preview) {
- //var param = _generateResourceLink( dest, blogId, type, resourceName, resourceDesc, preview );
- param = new Object();
- param["htmlCode"] = _generateResourceLink( dest, blogId, type, resourceName, resourceDesc, preview );
- __dlg_close(param);
- return false;
-};
-
-function addHtmlareaAlbumLink( dest, blogId, albumId, albumName, albumDesc )
-{
- param = new Object();
- param["htmlCode"] = _generateAlbumLink( dest, blogId, albumId, albumName, albumDesc );
- __dlg_close(param)
- return false;
-}
-
-function onCancel() {
- __dlg_close(null);
- return false;
-};
+ htmlCode = '<a href="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'" type="'+mimeType+'">';
+ htmlCode += '<img style="margin: 5px;" border="0" alt="'+resourceDesc+'" src="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'&mode=medium" />';
+ htmlCode += '</a>';
+ }
+ else {
+ htmlCode = '<img style="margin: 5px;" alt="'+resourceDesc+'" src="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'" />';
+ }
+ }
+ else {
+ // if not an image, there is not much we can do
+ htmlCode = '<a title="'+resourceDesc+'" href="'+plogBaseUrl+'/resserver.php?blogId='+blogId+'&resource='+encodeURIComponent(resourceName)+'" type="'+mimeType+'">test</a>';
+ }
+
+ return htmlCode;
+
+}
+
+function addResourceLink( dest, reqFormat, blogId, type, resourceName, resourceDesc, preview, mimeType )
+{
+ // generate the link
+ var htmlCode = _generateResourceLink( dest, reqFormat, blogId, type, resourceName, resourceDesc, preview, mimeType );
+
+ // and now send the value to the text area where we are typing the post
+ if( dest == 1 ) {
+ //parent.opener.document.newPost.postText.value += htmlCode;
+ addText( parent.opener.document.newPost.postText, htmlCode );
+ }
+ else {
+ //parent.opener.document.newPost.postExtendedText.value += htmlCode;
+ addText( parent.opener.document.newPost.postExtendedText, htmlCode );
+ }
+
+ // finally close this window since we don't need it anymore
+ //window.close();
+}
+
+function _generateAlbumLink( dest, blogId, albumId, albumName, albumDesc )
+{
+ var htmlCode = '';
+
+ // if no other global variable called 'indexPage' is defined, use the
+ // default one
+ if( indexPage == '' )
+ indexPage = 'index.php';
+
+ htmlCode = '<a title="'+albumDesc+'" href="'+plogBaseUrl+'/index.php?op=ViewAlbum&blogId='+blogId+'&albumId='+albumId+'">'+albumName+'</a>';
+
+ return htmlCode;
+}
+
+/**
+ * generates and adds a link to an album to the textarea
+ *
+ * @param dest
+ * @param blogId
+ * @param albumId
+ * @param albumName
+ * @param albumDesc
+ */
+function addAlbumLink( dest, blogId, albumId, albumName, albumDesc )
+{
+ albumLink = _generateAlbumLink( dest, blogId, albumId, albumName, albumDesc );
+
+ // and now send the value to the text area where we are typing the post
+ if( dest == 1 ) {
+ addText( parent.opener.document.newPost.postText, albumLink );
+ }
+ else {
+ addText( parent.opener.document.newPost.postExtendedText, albumLink );
+ }
+}
+
+// ------
+//
+// htmlarea-related code
+//
+// -------
+//
+
+function resourceListWindowInit(htmlarea) {
+ // if we use this method, the dialog will be resized to its full size and I don't like that...
+ if( htmlarea ) {
+ __dlg_init();
+ window.resizeTo(450,600);
+ }
+}
+
+function addHtmlareaLink(dest, blogId, type, resourceName, resourceDesc, preview, mimeType ) {
+ //var param = _generateResourceLink( dest, blogId, type, resourceName, resourceDesc, preview );
+ param = new Object();
+ param["htmlCode"] = _generateResourceLink( dest, blogId, type, resourceName, resourceDesc, preview, mimeType );
+ __dlg_close(param);
+ return false;
+};
+
+function addHtmlareaAlbumLink( dest, blogId, albumId, albumName, albumDesc )
+{
+ param = new Object();
+ param["htmlCode"] = _generateAlbumLink( dest, blogId, albumId, albumName, albumDesc );
+ __dlg_close(param)
+ return false;
+}
+
+function onCancel() {
+ __dlg_close(null);
+ return false;
+};
Modified: plog/branches/plog-1.0.1/templates/admin/resourcelist.template
===================================================================
--- plog/branches/plog-1.0.1/templates/admin/resourcelist.template 2005-05-20 07:18:23 UTC (rev 2026)
+++ plog/branches/plog-1.0.1/templates/admin/resourcelist.template 2005-05-20 07:45:19 UTC (rev 2027)
@@ -8,7 +8,7 @@
<script type="text/javascript" src="js/htmlarea/htmlarea-plog-resourcelist.js"></script>
<script type="text/javascript" src="js/ui/common.js"></script>
<script type="text/javascript">
- var plogBaseUrl = '{$baseurl}';
+ var plogBaseUrl = '{$baseurl}';
var indexPage = '{$config->getValue("script_name")}';
</script>
<style>{literal}
@@ -117,18 +117,18 @@
</td>
<td>
{if $htmlarea}
- <a href="javascript:addHtmlareaLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',false);">{$locale->tr("add_resource")}</a><br/>
+ <a href="javascript:addHtmlareaLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',false,'{$resource->getMimeType()}');">{$locale->tr("add_resource")}</a><br/>
{else}
- <a href="javascript:addResourceLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',false);">{$locale->tr("add_resource")}</a><br/>
+ <a href="javascript:addResourceLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',false,'{$resource->getMimeType()}');">{$locale->tr("add_resource")}</a><br/>
{/if}
{if $resource->hasPreview()}
{if $htmlarea}
- <a href="javascript:addHtmlareaLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',1);">{$locale->tr("add_resource_preview")}</a><br/>
- <a href="javascript:addHtmlareaLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',2);">{$locale->tr("add_resource_medium")}</a><br/>
+ <a href="javascript:addHtmlareaLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',1,'{$resource->getMimeType()}');">{$locale->tr("add_resource_preview")}</a><br/>
+ <a href="javascript:addHtmlareaLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',2,'{$resource->getMimeType()}');">{$locale->tr("add_resource_medium")}</a><br/>
{else}
- <a href="javascript:addResourceLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',1);">{$locale->tr("add_resource_preview")}</a><br/>
- <a href="javascript:addResourceLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',2);">{$locale->tr("add_resource_medium")}</a><br/>
+ <a href="javascript:addResourceLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',1,'{$resource->getMimeType()}');">{$locale->tr("add_resource_preview")}</a><br/>
+ <a href="javascript:addResourceLink({$destination},{$blog->getId()},{$resource->getResourceType()},'{$resource->getFileName()|escape:"javascript"}','{$resource->getDescription()|escape:"javascript"}',2,'{$resource->getMimeType()}');">{$locale->tr("add_resource_medium")}</a><br/>
{/if}
{/if}
</td>
More information about the pLog-svn
mailing list