From 23449a857a88bb097b90eae49baa5e456c76fe29 Mon Sep 17 00:00:00 2001
From: sakamocchi <o-takashi@sakamocchi.jp>
Date: Sat, 16 Jun 2012 19:33:54 +0900
Subject: [PATCH] =?utf8?q?CHANGE:=20=E3=83=A1=E3=83=87=E3=82=A3=E3=82=A2?=
 =?utf8?q?=E7=AE=A1=E7=90=86=E3=83=97=E3=83=A9=E3=82=B0=E3=82=A4=E3=83=B3?=
 =?utf8?q?=E3=81=8C=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=80=81=E3=83=80?=
 =?utf8?q?=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=82=92=E8=A1=A8=E7=A4=BA?=
 =?utf8?q?=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AB=E3=82=A2=E3=83=A9=E3=83=BC?=
 =?utf8?q?=E3=83=88=E3=82=92=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

NP_MediumあるいはNP_MediaTocuなどのプラグインがインストールされていない場合、アイテム追加・編集画面でダイアログを開くと「Media
Plugin Not Fount」のアラートが出るよう修正。
合わせて、JavaScriptのメソッド「setMediaPopupURL」を削除。
---
 nucleus/forms/additemform.template          | 51 +++++++++++++----------------
 skins/admin/bookmarklet/javascripts/edit.js |  7 +---
 skins/admin/default/javascripts/edit.js     |  7 +---
 3 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/nucleus/forms/additemform.template b/nucleus/forms/additemform.template
index 47d65f4..47d6847 100644
--- a/nucleus/forms/additemform.template
+++ b/nucleus/forms/additemform.template
@@ -1,30 +1,25 @@
-<script type="text/javascript">setMediaPopupURL('<%formdata(adminurl)%>');</script>
-
 <form method="post" action="<%formdata(adminurl)%>index.php">
- <div class="blogform">
-   <%ticket%>
-   <input type="hidden" name="action" value="additem" />
-   <input type="hidden" name="actiontype" value="addnow" />		   
-   <input type="hidden" name="closed" value="0" />		   
-   <input type="hidden" name="catid" value="<%formdata(catid)%>" />
-   <input type="submit" name="submit" value="<%text(_ADD_ADDITEM)%>" class="formbutton" />
-   <br />
-   <input type="text" 
-	name="title" 
-	id="inputtitle" 
-	onkeyup="storeCaret(this); updPreview('title');"
-	onclick="storeCaret(this);"
-	onselect="storeCaret(this);" 
-	onkeypress="shortCuts();"			   
-	class="formfield" size="45" value="" />
-   <br />
-   <textarea name="body" id="inputbody" class="formfield" cols="45" rows="12" 
-	onkeyup="storeCaret(this); updPreview('body');"
-	onclick="storeCaret(this);"
-	onselect="storeCaret(this);" 
-	onkeypress="shortCuts();"	></textarea>
-   <br />
-   <span class="shortcuts">[ctrl+shift+A]&nbsp;=&nbsp;Link, [ctrl+shift+B]&nbsp;=&nbsp;Bold, [ctrl+shift+I]&nbsp;=&nbsp;Italic, [ctrl+shift+M]&nbsp;=&nbsp;Insert&nbsp;Media.</span>
-   <%callback(FormExtra,additemform)%>	
- </div>
+<div class="blogform">
+<%ticket%>
+<input type="hidden" name="action" value="additem" />
+<input type="hidden" name="actiontype" value="addnow" />
+<input type="hidden" name="closed" value="0" />
+<input type="hidden" name="catid" value="<%formdata(catid)%>" />
+<input type="submit" name="submit" value="<%text(_ADD_ADDITEM)%>" class="formbutton" /><br />
+<input type="text"
+ name="title"
+ id="inputtitle"
+ onkeyup="storeCaret(this); updPreview('title');"
+ onclick="storeCaret(this);"
+ onselect="storeCaret(this);"
+ onkeypress="shortCuts();"
+ class="formfield" size="45" value="" /><br />
+<textarea name="body" id="inputbody" class="formfield" cols="45" rows="12"
+ onkeyup="storeCaret(this); updPreview('body');"
+ onclick="storeCaret(this);"
+ onselect="storeCaret(this);"
+ onkeypress="shortCuts();"	></textarea><br />
+<span class="shortcuts">[ctrl+shift+A]&nbsp;=&nbsp;Link, [ctrl+shift+B]&nbsp;=&nbsp;Bold, [ctrl+shift+I]&nbsp;=&nbsp;Italic, [ctrl+shift+M]&nbsp;=&nbsp;Insert&nbsp;Media.</span>
+<%callback(FormExtra,additemform)%>	
+</div>
 </form>
diff --git a/skins/admin/bookmarklet/javascripts/edit.js b/skins/admin/bookmarklet/javascripts/edit.js
index 131860c..2f00ebc 100644
--- a/skins/admin/bookmarklet/javascripts/edit.js
+++ b/skins/admin/bookmarklet/javascripts/edit.js
@@ -143,15 +143,10 @@ function addMedia() {
 	}
 	else
 	{
-		var mediapopup = window.open(nucleusMediaPopupURL + 'media.php','name',
-			'status=yes,toolbar=no,scrollbars=yes,resizable=yes,width=500,height=450,top=0,left=0');
+		alert('Media Plugin Not Found');
 	}
 }
 
-function setMediaPopupURL(url) {
-	nucleusMediaPopupURL = url;
-}
-
 function includeImage(collection, filename, type, width, height) {
 	if (isCaretEmpty()) {
 		text = prompt("Text to display ?",filename);
diff --git a/skins/admin/default/javascripts/edit.js b/skins/admin/default/javascripts/edit.js
index adf6fa5..6fcf3ae 100644
--- a/skins/admin/default/javascripts/edit.js
+++ b/skins/admin/default/javascripts/edit.js
@@ -144,16 +144,11 @@ function addMedia()
 	}
 	else
 	{
-		var mediapopup = window.open(nucleusMediaPopupURL + 'media.php','name',
-			'status=yes,toolbar=no,scrollbars=yes,resizable=yes,width=500,height=450,top=0,left=0');
+		alert('Media Plugin Not Found');
 	}
 	return;
 }
 
-function setMediaPopupURL(url) {
-	nucleusMediaPopupURL = url;
-}
-
 function includeImage(collection, filename, type, width, height) {
 	if (isCaretEmpty()) {
 		text = prompt("Text to display ?",filename);
-- 
2.11.0