fix old ocmod conflict

Dreamvention · Jan 6, 2017 · dfeb4c9 · dfeb4c9
1 parent daa9e0c
commit dfeb4c9
Showing 1 changed file with 28 additions and 28 deletions.
diff --git a/system/mbooth/install/d_visual_designer.xml b/system/mbooth/install/d_visual_designer.xml
@@ -6,68 +6,68 @@
 
     <file path="admin/controller/catalog/product.php">
         <operation>
-			<search><![CDATA[	protected function getForm() {]]></search>
-			<add  position="after"><![CDATA[
-    			$this->document->addScript('view/javascript/d_visual_designer/d_visual_designer.js');
-			]]></add>
-		</operation>
+            <search><![CDATA[   protected function getForm() {]]></search>
+            <add  position="after"><![CDATA[
+                $this->document->addScript('view/javascript/d_visual_designer/d_visual_designer.js');
+            ]]></add>
+        </operation>
     </file>
-	<file path="admin/view/template/catalog/product_form.tpl">
-        <operation error="skip">
-			<search><![CDATA[class="form-control summernote"]]></search>
-			<add position="replace"><![CDATA[
-			class="form-control summernote d_visual_designer"
-			]]></add>
-		</operation>
+    <file path="admin/view/template/catalog/product_form.tpl">
         <operation error="skip">
-			<search><![CDATA[<textarea name="product_description[<?php echo $language['language_id']; ?>][description]" placeholder="<?php echo $entry_description; ?>" id="input-description<?php echo $language['language_id']; ?>"><?php echo isset($product_description[$language['language_id']]) ? $product_description[$language['language_id']]['description'] : ''; ?></textarea>]]></search>
-			<add position="replace"><![CDATA[
+            <search><![CDATA[<textarea name="product_description[<?php echo $language['language_id']; ?>][description]" placeholder="<?php echo $entry_description; ?>" id="input-description<?php echo $language['language_id']; ?>"><?php echo isset($product_description[$language['language_id']]) ? $product_description[$language['language_id']]['description'] : ''; ?></textarea>]]></search>
+            <add position="replace"><![CDATA[
                 <textarea name="product_description[<?php echo $language['language_id']; ?>][description]" class="d_visual_designer" placeholder="<?php echo $entry_description; ?>" id="input-description<?php echo $language['language_id']; ?>"><?php echo isset($product_description[$language['language_id']]) ? $product_description[$language['language_id']]['description'] : ''; ?></textarea>
-			]]></add>
-		</operation>
+            ]]></add>
+        </operation>
+        <operation error="skip">
+            <search><![CDATA[class="form-control summernote"]]></search>
+            <add position="replace"><![CDATA[
+            class="form-control summernote d_visual_designer"
+            ]]></add>
+        </operation>
     </file>
     <file path="admin/controller/catalog/category.php">
         <operation>
-            <search><![CDATA[	protected function getForm() {]]></search>
+            <search><![CDATA[   protected function getForm() {]]></search>
             <add position="after"><![CDATA[
             $this->document->addScript('view/javascript/d_visual_designer/d_visual_designer.js');
             ]]></add>
         </operation>
     </file>
 
     <file path="admin/view/template/catalog/category_form.tpl">
+        <operation error="skip">
+            <search><![CDATA[<textarea name="category_description[<?php echo $language['language_id']; ?>][description]" placeholder="<?php echo $entry_description; ?>" id="input-description<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($category_description[$language['language_id']]) ? $category_description[$language['language_id']]['description'] : ''; ?></textarea>]]></search>
+            <add position="replace"><![CDATA[
+                <textarea name="category_description[<?php echo $language['language_id']; ?>][description]" class="d_visual_designer" placeholder="<?php echo $entry_description; ?>" id="input-description<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($category_description[$language['language_id']]) ? $category_description[$language['language_id']]['description'] : ''; ?></textarea>
+            ]]></add>
+        </operation>
         <operation error="skip">
             <search><![CDATA[class="form-control summernote"]]></search>
             <add position="replace"><![CDATA[
             class="form-control summernote d_visual_designer"
             ]]></add>
         </operation>
-        <operation error="skip">
-			<search><![CDATA[<textarea name="category_description[<?php echo $language['language_id']; ?>][description]" placeholder="<?php echo $entry_description; ?>" id="input-description<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($category_description[$language['language_id']]) ? $category_description[$language['language_id']]['description'] : ''; ?></textarea>]]></search>
-			<add position="replace"><![CDATA[
-                <textarea name="category_description[<?php echo $language['language_id']; ?>][description]" class="d_visual_designer" placeholder="<?php echo $entry_description; ?>" id="input-description<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($category_description[$language['language_id']]) ? $category_description[$language['language_id']]['description'] : ''; ?></textarea>
-			]]></add>
-		</operation>
     </file>
     <file path="admin/controller/catalog/information.php">
         <operation>
-            <search><![CDATA[	protected function getForm() {]]></search>
+            <search><![CDATA[   protected function getForm() {]]></search>
             <add position="after"><![CDATA[
                 $this->document->addScript('view/javascript/d_visual_designer/d_visual_designer.js');
             ]]></add>
         </operation>
     </file>
     <file path="admin/view/template/catalog/information_form.tpl">
         <operation error="skip">
-            <search><![CDATA[class="form-control summernote"]]></search>
+            <search><![CDATA[<textarea name="information_description[<?php echo $language['language_id']; ?>][description]" placeholder="<?php echo $entry_description; ?>" id="input-description<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($information_description[$language['language_id']]) ? $information_description[$language['language_id']]['description'] : ''; ?></textarea>]]></search>
             <add position="replace"><![CDATA[
-            class="form-control summernote d_visual_designer"
+                <textarea name="information_description[<?php echo $language['language_id']; ?>][description]" class="d_visual_designer" placeholder="<?php echo $entry_description; ?>" id="input-description<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($information_description[$language['language_id']]) ? $information_description[$language['language_id']]['description'] : ''; ?></textarea>
             ]]></add>
         </operation>
         <operation error="skip">
-            <search><![CDATA[<textarea name="information_description[<?php echo $language['language_id']; ?>][description]" placeholder="<?php echo $entry_description; ?>" id="input-description<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($information_description[$language['language_id']]) ? $information_description[$language['language_id']]['description'] : ''; ?></textarea>]]></search>
+            <search><![CDATA[class="form-control summernote"]]></search>
             <add position="replace"><![CDATA[
-                <textarea name="information_description[<?php echo $language['language_id']; ?>][description]" class="d_visual_designer" placeholder="<?php echo $entry_description; ?>" id="input-description<?php echo $language['language_id']; ?>" class="form-control"><?php echo isset($information_description[$language['language_id']]) ? $information_description[$language['language_id']]['description'] : ''; ?></textarea>
+            class="form-control summernote d_visual_designer"
             ]]></add>
         </operation>
     </file>