Merge branch 'develop' of https://github.com/tagbangers/wallride

tagbangers · Mar 2, 2017 · 8d00b13 · 8d00b13
2 parents d343791 + c472481
commit 8d00b13
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>org.wallride</groupId>
 	<artifactId>wallride</artifactId>
-	<version>1.0.0.M12</version>
+	<version>1.0.0.M13</version>
 	<packaging>pom</packaging>
 	<name>WallRide</name>
 	<description>CMS for developers of principles</description>
@@ -80,7 +80,7 @@
 			<dependency>
 				<groupId>org.wallride</groupId>
 				<artifactId>wallride-core</artifactId>
-				<version>1.0.0.M12</version>
+				<version>1.0.0.M13</version>
 			</dependency>
 
 			<!-- Spring -->

diff --git a/wallride-bootstrap/pom.xml b/wallride-bootstrap/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.wallride</groupId>
         <artifactId>wallride-parent</artifactId>
-        <version>1.0.0.M12</version>
+        <version>1.0.0.M13</version>
         <relativePath>../wallride-parent/pom.xml</relativePath>
     </parent>
     <artifactId>wallride-bootstrap</artifactId>

diff --git a/wallride-core/pom.xml b/wallride-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.wallride</groupId>
 		<artifactId>wallride</artifactId>
-		<version>1.0.0.M12</version>
+		<version>1.0.0.M13</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>wallride-core</artifactId>

diff --git a/wallride-core/src/main/resources/templates/admin/article/create.html b/wallride-core/src/main/resources/templates/admin/article/create.html
@@ -31,7 +31,9 @@ <h1 th:text="${title}?:#{AddNewArticle}">Add New Article</h1>
 											form.attr('action', action);
 											form.attr('target', '_blank');
 											$(':input[name="body"]', form).val($('#wr-page-content :input[name="body"]').froalaEditor('html.get'));
+											$('body').append(form);
 											form.submit();
+											form.remove();
 										});
 									});
 								</script>

diff --git a/wallride-core/src/main/resources/templates/admin/page/create.html b/wallride-core/src/main/resources/templates/admin/page/create.html
@@ -33,7 +33,9 @@ <h1 th:text="${title}?:#{AddNewPage}">Add New Page</h1>
 											form.attr('action', action);
 											form.attr('target', '_blank');
 											$(':input[name="body"]', form).val($('#wr-page-content :input[name="body"]').froalaEditor('html.get'));
+											$('body').append(form);
 											form.submit();
+											form.remove();
 										});
 									});
 								</script>

diff --git a/wallride-parent/pom.xml b/wallride-parent/pom.xml
@@ -11,7 +11,7 @@
     </parent>
     <groupId>org.wallride</groupId>
     <artifactId>wallride-parent</artifactId>
-    <version>1.0.0.M12</version>
+    <version>1.0.0.M13</version>
     <packaging>pom</packaging>
     <name>WallRide Parent</name>
     <description>CMS for developers of principles</description>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.wallride</groupId>
             <artifactId>wallride-core</artifactId>
-            <version>1.0.0.M12</version>
+            <version>1.0.0.M13</version>
         </dependency>
 
         <dependency>

diff --git a/wallride-tools/pom.xml b/wallride-tools/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.wallride</groupId>
         <artifactId>wallride</artifactId>
-        <version>1.0.0.M12</version>
+        <version>1.0.0.M13</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>wallride-tools</artifactId>