From e34f2d3b658de24bd98c015ecf917b092e2318b3 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 10 Mar 2015 10:35:53 +0000 Subject: [PATCH] Fixed several input fields in the content center which were very small git-svn-id: https://svn.libreccm.org/ccm/trunk@3278 8810af33-2d31-482b-a856-94f89814c4df --- .../foundry/foundry/lib/search/terms.xsl | 1 + .../foundry/foundry/lib/template-parser.xsl | 9 +- .../foundry/foundry/scripts/category-step.js | 202 +++++++++--------- .../themes/foundry/foundry/styles/admin.css | 11 + 4 files changed, 120 insertions(+), 103 deletions(-) diff --git a/ccm-core/web/themes/foundry/foundry/lib/search/terms.xsl b/ccm-core/web/themes/foundry/foundry/lib/search/terms.xsl index a13a24586..9a3b3df06 100644 --- a/ccm-core/web/themes/foundry/foundry/lib/search/terms.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib/search/terms.xsl @@ -49,6 +49,7 @@ diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl index c4f4e762b..8fda514dc 100644 --- a/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl @@ -398,9 +398,14 @@ - + - + + + + + + diff --git a/ccm-core/web/themes/foundry/foundry/scripts/category-step.js b/ccm-core/web/themes/foundry/foundry/scripts/category-step.js index ce1436d27..58636329f 100644 --- a/ccm-core/web/themes/foundry/foundry/scripts/category-step.js +++ b/ccm-core/web/themes/foundry/foundry/scripts/category-step.js @@ -1,137 +1,137 @@ /* - Copyright: 2006, 2007, 2008 Sören Bernstein - - This file is part of Mandalay. - - Mandalay is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - Mandalay is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Mandalay. If not, see . -*/ + Copyright: 2006, 2007, 2008 Sören Bernstein + + This file is part of Mandalay. + + Mandalay is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + Mandalay is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Mandalay. If not, see . + */ /* DE - Diese Funktionen sind Teil der AJAX-Seite zum Zuweisen der Kategorien. -*/ + Diese Funktionen sind Teil der AJAX-Seite zum Zuweisen der Kategorien. + */ /* EN - These functions are part of the ajax-pages to assign categories. -*/ + These functions are part of the ajax-pages to assign categories. + */ // DE Lade einen Kategorienzweig nach, wenn dieser aufgeklappt wird // EN Loading a branch of categories when it is expanded function catBranchToggle(id, selCats) { - var elToggleTreeImage = document.getElementById("catTreeToggleImage" + id); - var elBranch = document.getElementById("catBranch" + id); - - if(elBranch.style.display == "" || elBranch.style.display == "none") { - if(elBranch.innerHTML == "" || elBranch.innerHTML == "...") { - elBranch.innerHTML = "..."; - elBranch.style.display = "block"; - $(elBranch).load("load-cat.jsp", "nodeID=" + id + "&selectedCats=" + selCats); + var elToggleTreeImage = document.getElementById("catTreeToggleImage" + id); + var elBranch = document.getElementById("catBranch" + id); + + if (elBranch.style.display == "" || elBranch.style.display == "none") { + if (elBranch.innerHTML == "" || elBranch.innerHTML == "...") { + elBranch.innerHTML = "..."; + elBranch.style.display = "block"; + $(elBranch).load("load-cat.jsp", "nodeID=" + id + "&selectedCats=" + selCats); + } else { + elBranch.style.display = "block"; + } + elToggleTreeImage.src = elToggleTreeImage.src.replace("Expand", "Collapse"); + elToggleTreeImage.alt = "[-]"; } else { - elBranch.style.display = "block"; + elBranch.style.display = "none"; + elToggleTreeImage.src = elToggleTreeImage.src.replace("Collapse", "Expand"); + elToggleTreeImage.alt = "[+]"; } - elToggleTreeImage.src = elToggleTreeImage.src.replace("Expand", "Collapse"); - elToggleTreeImage.alt = "[-]"; - } else { - elBranch.style.display = "none"; - elToggleTreeImage.src = elToggleTreeImage.src.replace("Collapse", "Expand"); - elToggleTreeImage.alt = "[+]"; - } - return false; + return false; } // DE Wechselt die Ansicht eines Kategorienzweiges // EN Toggles display of a branch of categories function catToggle(id, selCats) { - var elToggleTreeImage = document.getElementById("catTreeToggleImage" + id); - var elBranch = document.getElementById("catBranch" + id); - - if(elBranch.style.display == "" || elBranch.style.display == "none") { - elBranch.style.display = "block"; - elToggleTreeImage.src = elToggleTreeImage.src.replace("Expand", "Collapse"); - elToggleTreeImage.alt = "[-]"; - } else { - elBranch.style.display = "none"; - elToggleTreeImage.src = elToggleTreeImage.src.replace("Collapse", "Expand"); - elToggleTreeImage.alt = "[+]"; - } - return false; + var elToggleTreeImage = document.getElementById("catTreeToggleImage" + id); + var elBranch = document.getElementById("catBranch" + id); + + if (elBranch.style.display == "" || elBranch.style.display == "none") { + elBranch.style.display = "block"; + elToggleTreeImage.src = elToggleTreeImage.src.replace("Expand", "Collapse"); + elToggleTreeImage.alt = "[-]"; + } else { + elBranch.style.display = "none"; + elToggleTreeImage.src = elToggleTreeImage.src.replace("Collapse", "Expand"); + elToggleTreeImage.alt = "[+]"; + } + return false; } // DE Wählt eine Kategorie aus // EN Select a category function catSelect(id) { - var elWidgetHidden = document.getElementById("catWdHd"); + var elWidgetHidden = document.getElementById("catWdHd"); - var found = 0; - - for(var i = 0; i < elWidgetHidden.options.length && found == 0; i++) { - if(elWidgetHidden.options[i].value == id) { - found = 1; + var found = 0; + + for (var i = 0; i < elWidgetHidden.options.length && found == 0; i++) { + if (elWidgetHidden.options[i].value == id) { + found = 1; + } } - } - - if(! found) { - var optHidden = new Option('add ' + id, id, false, true); - elWidgetHidden.options[elWidgetHidden.options.length] = optHidden; - } - - // DE Ändere den Link - // EN Change link - var elToggleLink = document.getElementById("catToggleLink" + id); - elToggleLink.removeAttribute("onclick"); - elToggleLink.setAttribute("onclick", "catDeselect('" + id + "');"); - // DE Ändere das Icon - // EN Change image - var elToggleImage = document.images["catToggleImage" + id]; - elToggleImage.src = elToggleImage.src.replace("Unselected", "Selected"); - elToggleImage.alt = "[X]"; - - return false; + if (!found) { + var optHidden = new Option('add ' + id, id, false, true); + elWidgetHidden.options[elWidgetHidden.options.length] = optHidden; + } + + // DE Ändere den Link + // EN Change link + var elToggleLink = document.getElementById("catToggleLink" + id); + elToggleLink.removeAttribute("onclick"); + elToggleLink.setAttribute("onclick", "catDeselect('" + id + "');"); + + // DE Ändere das Icon + // EN Change image + var elToggleImage = document.images["catToggleImage" + id]; + elToggleImage.src = elToggleImage.src.replace("Unselected", "Selected"); + elToggleImage.alt = "[X]"; + + return false; } // DE Macht eine Auswahl rückgängig // EN Deselect a category function catDeselect(id) { - var elWidgetHidden = document.getElementById("catWdHd"); + var elWidgetHidden = document.getElementById("catWdHd"); - var found = 0; + var found = 0; - for(var i = 0; i < elWidgetHidden.options.length; i++) { - if(elWidgetHidden.options[i].value == id) { - if(elWidgetHidden.options[i].text == id) { - found = 1; - } - elWidgetHidden.removeChild(elWidgetHidden.options[i]); + for (var i = 0; i < elWidgetHidden.options.length; i++) { + if (elWidgetHidden.options[i].value == id) { + if (elWidgetHidden.options[i].text == id) { + found = 1; + } + elWidgetHidden.removeChild(elWidgetHidden.options[i]); + } + } + + if (found) { + var optHidden = new Option('del ' + id, id, false, true); + elWidgetHidden.options[elWidgetHidden.options.length] = optHidden; } - } - - if (found) { - var optHidden = new Option('del ' + id, id, false, true); - elWidgetHidden.options[elWidgetHidden.options.length] = optHidden; - } // DE Ändert den Link - // EN Change link - var elToggleLink = document.getElementById("catToggleLink" + id); - elToggleLink.removeAttribute("onclick"); - elToggleLink.setAttribute("onclick", "catSelect('" + id + "');"); - - // DE Ändert das Icon - // EN Change image - var elToggleImage = document.images["catToggleImage" + id]; - elToggleImage.src = elToggleImage.src.replace("Selected", "Unselected"); - elToggleImage.alt = "[ ]"; + // EN Change link + var elToggleLink = document.getElementById("catToggleLink" + id); + elToggleLink.removeAttribute("onclick"); + elToggleLink.setAttribute("onclick", "catSelect('" + id + "');"); - return false; + // DE Ändert das Icon + // EN Change image + var elToggleImage = document.images["catToggleImage" + id]; + elToggleImage.src = elToggleImage.src.replace("Selected", "Unselected"); + elToggleImage.alt = "[ ]"; + + return false; } diff --git a/ccm-core/web/themes/foundry/foundry/styles/admin.css b/ccm-core/web/themes/foundry/foundry/styles/admin.css index b10da51b7..556ca8aab 100644 --- a/ccm-core/web/themes/foundry/foundry/styles/admin.css +++ b/ccm-core/web/themes/foundry/foundry/styles/admin.css @@ -885,6 +885,10 @@ div#search{ position: relative; } +div#search .terms input#terms { + width: 100%; +} + div .terms{ margin: 0; margin-top: 10px; @@ -1045,6 +1049,7 @@ div.bebop-left, form[name="category"] table { -webkit-border-radius: 10px; -moz-border-radius: 10px; -o-border-radius: 10px; + width: 94%; } form[name="category"] table table{ @@ -1589,6 +1594,12 @@ input#draft_search:active { font-weight: bold; } +#content form#pageCreate input[type='text'], +form#propertyedit input[type='text'] { + width: 35em; + max-width: 55%; +} + #content span.option-group input[value="externalLink"]:checked ~ fieldset[class="internalLink"]{ display:none; }