Clean up view pages

MinecraftHopper · Mar 30, 2015 · 89e515d · 89e515d
1 parent 9701329
commit 89e515d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 35 deletions.
diff --git a/html/factoid/edit.phtml b/html/factoid/edit.phtml
@@ -76,37 +76,6 @@
                                 e.setSelection(cursor, cursor + chunk.length);
                             }
                         }, {
-                            name: 'customItalic',
-                            title: 'Italic',
-                            hotkey: 'Ctrl+I',
-                            icon: {glyph: 'glyphicon glyphicon-italic', fa: 'fa fa-italic', 'fa-3': 'icon-italic'},
-                            callback: function (e) {
-                                // Give/remove ** surround the selection
-                                var chunk, cursor, selected = e.getSelection(),
-                                      content = e.getContent();
-
-                                if (selected.length === 0) {
-                                    // Give extra word
-                                    chunk = e.__localize('');
-                                } else {
-                                    chunk = selected.text;
-                                }
-
-                                // transform selection and set the cursor into chunked text
-                                if (content.substr(selected.start - 3, 3) === '[i]'
-                                      && content.substr(selected.end, 4) === '[/i]') {
-                                    e.setSelection(selected.start - 3, selected.end + 4);
-                                    e.replaceSelection(chunk);
-                                    cursor = selected.start - 3;
-                                } else {
-                                    e.replaceSelection('[i]' + chunk + '[/i]');
-                                    cursor = selected.start + 3;
-                                }
-
-                                // Set the cursor
-                                e.setSelection(cursor, cursor + chunk.length);
-                            }
-                        }, {
                             name: "cmdUnderlineC",
                             toggle: true,
                             title: "Underline",

diff --git a/html/factoid/factoid.phtml b/html/factoid/factoid.phtml
@@ -27,9 +27,9 @@
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
                 <li class="dropdown">
-                    <a class="dropdown-toggle" data-toggle="dropdown">Select Database <b class="caret"></b></a>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Select Database <b class="caret"></b></a>
                     <ul data-bind="foreach: gameTable" id="dbList" class="dropdown-menu">
-                        <li data-bind="click: loadDataFromMenu"><a data-bind="text: $data.displayname"></a></li>
+                        <li><a data-bind="click: loadDataFromMenu, text: $data.displayname, attr: {href: '?db=' + $data.displayname}"></a></li>
                     </ul>
                 </li>
             </ul>

diff --git a/html/index.phtml b/html/index.phtml
@@ -47,7 +47,7 @@
                 <?php if ($isset) { ?>
                     <li><a href="/admin/ban">Ban Management</a></li>
                     <li><a href="/admin/user">User Management</a></li>
-                    <li><a href="/admin/bot">Bot Management</a></li>
+                    <!--<li><a href="/admin/bot">Bot Management</a></li>-->
                 <?php } ?>
             </ul>
         </div>

diff --git a/routes/factoid/index.php b/routes/factoid/index.php
@@ -23,7 +23,7 @@
         try {
             if (Authentication::checkPermission('factoids.edit')) {
                 $factoids = Factoids::getFactoid($request->param('id'));
-                $service->render(HTML_DIR . 'index.phtml', array('action' => 'factoid', 'page' => HTML_DIR . 'factoid/edit.phtml', 'id' => $factoids['id'], 'name' => $factoids['name'], 'content' => $factoids['content'], 'game' => $factoids['game'], 'mode' => 'Edit'));
+                $service->render(HTML_DIR . 'index.phtml', array('action' => 'factoid', 'page' => HTML_DIR . 'factoid/edit.phtml', 'id' => $factoids['id'], 'name' => $factoids['name'], 'content' => str_replace(';;', "\n", $factoids['content']), 'game' => $factoids['game'], 'mode' => 'Edit'));
             }
         } catch (PDOException $ex) {
             Utilities::logError($ex);