Merge pull request #1420 from voltan/develop

Work on core

.gitmodules

@@ -10,3 +10,12 @@
 [submodule "usr/module/sitemap"]
 	path = usr/module/sitemap
 	url = https://github.com/pi-module/sitemap
+[submodule "usr/module/message"]
+	path = usr/module/message
+	url = https://github.com/pi-module/message
+[submodule "usr/module/comment"]
+	path = usr/module/comment
+	url = https://github.com/pi-module/comment
+[submodule "usr/module/search"]
+	path = usr/module/search
+	url = https://github.com/pi-module/search

lib/Pi/Form/View/Helper/Form.php

@@ -217,6 +217,17 @@ public function render(FormInterface $form, $options = array())
     </div>
 </div>
 <div class="%error_size% help-block">%error_content%</div>
+EOT;
+                    break;
+
+                case 'button':
+                    $labelPattern = '';
+                    $elementPattern =<<<EOT
+<div class="%element_size% js-form-element">
+    %element_content%
+    %desc_html%
+</div>
+<div class="%error_size% help-block">%error_content%</div>
 EOT;
                     break;
 

lib/Pi/View/Helper/ThemeAssemble.php

@@ -261,11 +261,15 @@ public function renderStrategy($module)
                 $moduleMeta = Pi::registry('module')->read($module);
                 $headTitleStr = $moduleMeta['title'];
             }
-            if ($headTitleStr && $headTitleStr != $sitename) {
-                $headTitle->set($headTitleStr);
-            } else {
-                $headTitle->set(Pi::config('slogan'));
+            if ($headTitleStr && $headTitleStr == $sitename) {
+                $headTitle->setPrefix('');
+                $headTitle->setPostfix('');
+            }
+            if (!empty($slogan)) {
+                $slogan = $separator . $slogan;
+                $headTitle->setPostfix($slogan);
             }
+            $headTitle->set($headTitleStr);
         }
     }