Merge branch '2.9' of github.com:thorsten/phpMyFAQ into 2.9

* '2.9' of github.com:thorsten/phpMyFAQ:
  Fix editor width
  Width and height for the editor in non wysiwyg mode
  Remove spaces in textarea before and after data

Author: thorsten

phpmyfaq/admin/assets/less/style.less

@@ -158,4 +158,8 @@ footer {
 // Login Page
 .login-panel {
   margin-top: 25%;
+}
+
+#answer {
+  height: 250px;
 }

phpmyfaq/admin/glossary.edit.php

@@ -52,16 +52,14 @@
                         </div>
                     </div>
 
-                    <div class="form-group">
-                        <label class="col-lg-2 control-label" for="definition">
-                            <?php echo $PMF_LANG['ad_glossary_definition']; ?>:
-                        </label>
-                        <div class="col-lg-4">
-                            <textarea  class="form-control" name="definition" id="definition" rows="3" required>
-<?php echo $glossaryItem['definition']; ?>
-                            </textarea>
-                        </div>
-                    </div>
+            <div class="control-group">
+                <label class="control-label" for="definition">
+                    <?php echo $PMF_LANG['ad_glossary_definition']; ?>:
+                </label>
+                <div class="controls">
+                    <textarea  class="input-xxlarge" name="definition" id="definition" cols="50" rows="3" required><?php echo $glossaryItem['definition']; ?></textarea>
+                </div>
+            </div>
 
                     <div class="form-group">
                         <div class="col-lg-offset-2 col-lg-4">

phpmyfaq/admin/record.edit.php

@@ -284,14 +284,12 @@ class="form-horizontal">
                                     echo $faqData['title'] ?></textarea>
                             </div>
                         </div>
-                        <!-- Answer -->
-                        <div class="form-group">
-                            <div class="col-lg-12">
-                                <noscript>Please enable JavaScript to use the WYSIWYG editor!</noscript>
-                                <textarea id="answer" name="answer" class="form-control" rows="10">
-                                    <?php echo $faqData['content'] ?>
-                                </textarea>
-                            </div>
+                    </div>
+                    <!-- Answer -->
+                    <div class="control-group">
+                        <div class="controls">
+                            <noscript>Please enable JavaScript to use the WYSIWYG editor!</noscript>
+                            <textarea id="answer" name="answer" class="span11"><?php echo $faqData['content'] ?></textarea>
                         </div>
 
                         <!-- Language -->
@@ -469,13 +467,10 @@ class="form-control">
                             </div>
                         </div>
                     </div>
-
-                    <?php if (is_numeric($faqData['id']) && $faqData['id'] > 0): ?>
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <a data-toggle="collapse" data-parent="#accordion" href="#collapseViewChangelog">
-                                <?php echo $PMF_LANG['ad_entry_changelog_history']; ?>
-                            </a>
+                    <div class="control-group">
+                        <label class="control-label" for="changed"><?php echo $PMF_LANG["ad_entry_changed"]; ?></label>
+                        <div class="controls">
+                            <textarea name="changed" id="changed" class="span8"><?php echo $faqData['changed'] ?></textarea>
                         </div>
 
                         <div id="collapseViewChangelog" class="panel-collapse collapse">