Index: img_assist.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/img_assist/img_assist.js,v
retrieving revision 1.6.4.2
diff -u -p -r1.6.4.2 img_assist.js
--- img_assist.js 22 Jul 2008 23:08:13 -0000 1.6.4.2
+++ img_assist.js 9 Jan 2011 13:05:27 -0000
@@ -15,7 +15,7 @@ Drupal.theme.prototype.img_assist_link =
if (Drupal.settings.img_assist.link == 'icon') {
link = '';
}
- html += ''+ link +'';
+ html += ''+ link +'';
html += '';
return html;
}
Index: img_assist.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/img_assist/img_assist.module,v
retrieving revision 1.75.2.31
diff -u -p -r1.75.2.31 img_assist.module
--- img_assist.module 15 Jul 2009 22:58:07 -0000 1.75.2.31
+++ img_assist.module 9 Jan 2011 13:05:28 -0000
@@ -1002,12 +1002,13 @@ function img_assist_properties_form($for
}
$form['title'] = array(
'#type' => 'textfield',
- '#title' => t('Title (optional)'),
+ '#title' => t('Title'), // ORIGO HACK
'#default_value' => isset($title) ? $title : '',
'#size' => 50,
'#maxlength' => 255,
'#description' => NULL,
'#attributes' => array('onblur' => 'parent.updateCaption()'),
+ '#disabled' => TRUE, // ORIGO HACK
);
$form['desc'] = array(
'#type' => 'textfield',
@@ -1025,11 +1026,12 @@ function img_assist_properties_form($for
$form[] = array('#value' => '');
$form['size_label'] = array(
'#type' => 'select',
- '#default_value' => variable_get('img_assist_default_label', '100x100'),
- '#options' => $derivatives,
- '#attributes' => array('onchange' => 'parent.onChangeSizeLabel()'),
+ '#default_value' => 'thumb', // ORIGO HACK
+ '#options' => array('thumb' => 'Thumbnail', '' => 'Original', 'frame' => 'Framed'), // ORIGO HACK
+// '#attributes' => array('onchange' => 'parent.onChangeSizeLabel()'), // ORIGO HACK
);
$form[] = array('#value' => '
');
+/*
$form['width'] = array(
'#type' => 'textfield',
'#default_value' => $default_width,
@@ -1045,6 +1047,7 @@ function img_assist_properties_form($for
'#maxlength' => 4,
'#attributes' => array('onblur' => 'parent.onChangeHeight()'),
);
+*/
$form[] = array('#value' => '
');
$form[] = array('#value' => '');
@@ -1060,6 +1063,7 @@ function img_assist_properties_form($for
$form[] = array('#value' => ' | ');
// Link.
+/* // ORIGO HACK
if (user_access('access advanced options')) {
$form[] = array('#value' => ' ');
$form['link'] = array(
@@ -1119,7 +1123,7 @@ function img_assist_properties_form($for
'#value' => variable_get('img_assist_default_insert_mode', 'filtertag'),
);
}
-
+*/
// Hidden Fields.
$form['nid'] = array(
'#type' => 'hidden',
Index: img_assist_popup.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/img_assist/img_assist_popup.js,v
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.4 img_assist_popup.js
--- img_assist_popup.js 1 Feb 2009 09:59:57 -0000 1.1.2.4
+++ img_assist_popup.js 9 Jan 2011 13:05:28 -0000
@@ -116,6 +116,15 @@ function insertImage() {
if (window.opener || (tinyMCEPopup.editor && tinyMCEPopup.editor.id)) {
// Get variables from the fields on the properties frame
var formObj = frames['img_assist_main'].document.forms[0];
+
+ // Mediawiki HACK
+ var nodeTitle = frames['img_assist_main'].document.img_assist['edit-title'].value;
+ var alignment = formObj['edit-align'].value;
+ var size = formObj['edit-size-label'].value;
+ var description = formObj['edit-desc'].value;
+
+ return insertToEditor('[[Image:' + nodeTitle + '|' + alignment + '|' + size + '|' + description + ']]');
+
// Get mode (see img_assist.module for detailed comments)
if (formObj['edit-insertmode'].value == 'html') {
// return so the page can submit normally and generate the HTML code
|