Commit 5500332a authored by Vincent Calame's avatar Vincent Calame

Ajustements de mise en forme

parent 105c8790
......@@ -40,4 +40,5 @@ public interface InteractionConstants {
public final static String PATH_PARAMNAME = "path";
public final static String MESSAGE_PAGE = "_message";
public final static String DEFAULT_JSON = "_default";
public final static String SUBUNIT_MODE = "subunit";
}
......@@ -13,6 +13,7 @@ import fr.exemole.bdfserver.api.BdfContext;
import fr.exemole.bdfserver.api.BdfExtensionReference;
import fr.exemole.bdfserver.api.BdfServer;
import fr.exemole.bdfserver.api.instruction.BdfCommandResult;
import fr.exemole.bdfserver.api.interaction.InteractionConstants;
import fr.exemole.bdfserver.api.managers.ExtensionManager;
import fr.exemole.bdfserver.api.providers.ActionProvider;
import fr.exemole.bdfserver.api.users.BdfUser;
......@@ -227,7 +228,7 @@ public abstract class BdfHtmlProducer extends PageHtmlPrinter implements HtmlPro
throw new IllegalStateException("commandKey is null");
}
String unitCssClasses;
if (commandBox.mode().equals("fieldset")) {
if (commandBox.mode().equals(InteractionConstants.SUBUNIT_MODE)) {
unitCssClasses = "unit-Subunit";
} else {
unitCssClasses = "unit-Unit";
......
......@@ -58,7 +58,6 @@ import net.mapeadores.util.text.Labels;
public final class BdfHtmlUtils {
private final static HtmlAttributes TOPALIGN_ATTR = HA.attr("valign", "top");
private final static HtmlAttributes CONFIRMATIONCHECK_ATTR = HA.name(InteractionConstants.CONFIRMATIONCHECK_PARAMNAME).value(InteractionConstants.OK_CONFIRMATIONCHECK_PARAMVALUE);
private BdfHtmlUtils() {
}
......@@ -134,22 +133,17 @@ public final class BdfHtmlUtils {
}
public static boolean printSubsetHeader(HtmlPrinter hp, BdfServer bdfServer, BdfUser bdfUser, PermissionSummary permissionSummary, Subset subset, String page) {
if (hp.isWithJavascript()) {
boolean isSubsetAdmin = permissionSummary.isAdmin(subset.getSubsetKey());
if ((hp.isWithJavascript()) && (isSubsetAdmin)) {
hp
.NAV("subset-ChangeSelect")
.__(printSubsetChangeSelect(hp, bdfServer, bdfUser, permissionSummary, subset.getSubsetKey(), page))
._NAV();
}
hp
.__(printSubsetHeader(hp, subset, bdfUser.getWorkingLang()));
return true;
}
public static boolean printSubsetHeader(HtmlPrinter hp, Subset subset, Lang workingLang) {
hp
.HEADER("subset-Header")
.H1()
.__(printSubsetTitle(hp, subset, workingLang, true))
.__(printSubsetTitle(hp, subset, bdfUser.getWorkingLang(), isSubsetAdmin))
._H1()
._HEADER();
return true;
......
/* BdfServer_HtmlProducers - Copyright (c) 2015-2019 Vincent Calame - Exemole
/* BdfServer_HtmlProducers - Copyright (c) 2015-2020 Vincent Calame - Exemole
* Logiciel libre donné sous triple licence :
* 1) selon les termes de la CeCILL V2
* 2) selon les termes de l’EUPL V.1.1
......@@ -64,19 +64,9 @@ public class AddendaHtmlProducer extends BdfHtmlProducer {
}
setTitle(FichothequeUtils.getSubsetTitle(addenda, workingLang));
start();
if ((isWithJavascript()) && (isSubsetAdmin)) {
this
.DIV("subset-list-ChangeSelect")
.__(BdfHtmlUtils.printSubsetChangeSelect(this, bdfServer, bdfUser, permissionSummary, addenda.getSubsetKey(), AddendaDomain.ADDENDA_PAGE))
._DIV();
}
this
.HEADER("subset-Header")
.H1()
.__(BdfHtmlUtils.printSubsetTitle(this, addenda, workingLang, isSubsetAdmin))
._H1()
._HEADER();
this
.DIV("subset-list-Page")
.__(BdfHtmlUtils.printSubsetHeader(this, bdfServer, bdfUser, permissionSummary, addenda, AddendaDomain.ADDENDA_PAGE))
.DIV("subset-list-Commands")
.__(printCommands())
._DIV();
......@@ -95,7 +85,8 @@ public class AddendaHtmlProducer extends BdfHtmlProducer {
}
this
._UL()
.__(endUnit());
.__(endUnit())
._DIV();
}
end();
}
......
......@@ -61,19 +61,9 @@ public class AlbumHtmlProducer extends BdfHtmlProducer {
}
setTitle(FichothequeUtils.getSubsetTitle(album, workingLang));
start();
if ((isWithJavascript()) && (isSubsetAdmin)) {
this
.DIV("subset-list-ChangeSelect")
.__(BdfHtmlUtils.printSubsetChangeSelect(this, bdfServer, bdfUser, permissionSummary, album.getSubsetKey(), AlbumDomain.ALBUM_PAGE))
._DIV();
}
this
.HEADER("subset-Header")
.H1()
.__(BdfHtmlUtils.printSubsetTitle(this, album, workingLang, isSubsetAdmin))
._H1()
._HEADER();
this
.DIV("subset-list-Page")
.__(BdfHtmlUtils.printSubsetHeader(this, bdfServer, bdfUser, permissionSummary, album, AlbumDomain.ALBUM_PAGE))
.DIV("subset-list-Commands")
.__(printCommands())
._DIV();
......@@ -87,7 +77,8 @@ public class AlbumHtmlProducer extends BdfHtmlProducer {
}
this
._UL()
.__(endUnit());
.__(endUnit())
._DIV();
}
end();
}
......
......@@ -11,6 +11,7 @@ package fr.exemole.bdfserver.htmlproducers.album;
import fr.exemole.bdfserver.api.BdfContext;
import fr.exemole.bdfserver.api.interaction.Domains;
import fr.exemole.bdfserver.api.interaction.InteractionConstants;
import fr.exemole.bdfserver.api.interaction.domains.AlbumDomain;
import fr.exemole.bdfserver.api.roles.PermissionSummary;
import fr.exemole.bdfserver.api.users.BdfUser;
......@@ -56,7 +57,7 @@ public class AlbumMetadataFormHtmlProducer extends BdfHtmlProducer {
AlbumCommandBoxUtils.printAlbumDimCreationBox(this, commandBox, album);
List<AlbumDim> albumDimList = album.getAlbumMetadata().getAlbumDimList();
if (!albumDimList.isEmpty()) {
commandBox.mode("fieldset");
commandBox.mode(InteractionConstants.SUBUNIT_MODE);
this
.__(startUnit("", "_ title.album.albumdim_list"));
for (AlbumDim albumDim : albumDimList) {
......
......@@ -12,6 +12,7 @@ package fr.exemole.bdfserver.htmlproducers.configuration;
import fr.exemole.bdfserver.api.BdfContext;
import fr.exemole.bdfserver.api.groups.GroupDef;
import fr.exemole.bdfserver.api.interaction.Domains;
import fr.exemole.bdfserver.api.interaction.InteractionConstants;
import fr.exemole.bdfserver.api.interaction.domains.ConfigurationDomain;
import fr.exemole.bdfserver.api.managers.GroupManager;
import fr.exemole.bdfserver.api.users.BdfUser;
......@@ -49,7 +50,7 @@ public class GroupFormHtmlProducer extends BdfHtmlProducer {
.action(Domains.CONFIGURATION)
.family("CNF")
.page(ConfigurationDomain.GROUPFORM_PAGE)
.mode("fieldset");
.mode(InteractionConstants.SUBUNIT_MODE);
List<GroupDef> groupDefList = groupManager.getGroupDefList();
if (!groupDefList.isEmpty()) {
this
......
......@@ -48,22 +48,13 @@ public class CorpusHtmlProducer extends BdfHtmlProducer {
@Override
public void printHtml() {
start();
if ((isWithJavascript()) && (isSubsetAdmin)) {
this
.DIV("subset-list-ChangeSelect")
.__(BdfHtmlUtils.printSubsetChangeSelect(this, bdfServer, bdfUser, permissionSummary, corpus.getSubsetKey(), CorpusDomain.CORPUS_PAGE))
._DIV();
}
this
.HEADER("subset-Header")
.H1()
.__(BdfHtmlUtils.printSubsetTitle(this, corpus, workingLang, isSubsetAdmin))
._H1()
._HEADER();
this
.DIV("subset-list-Page")
.__(BdfHtmlUtils.printSubsetHeader(this, bdfServer, bdfUser, permissionSummary, corpus, CorpusDomain.CORPUS_PAGE))
.DIV("subset-list-Commands")
.__(printCommands())
.__(printInclude())
._DIV()
._DIV();
end();
}
......
......@@ -11,6 +11,7 @@ package fr.exemole.bdfserver.htmlproducers.corpus;
import fr.exemole.bdfserver.api.BdfContext;
import fr.exemole.bdfserver.api.interaction.Domains;
import fr.exemole.bdfserver.api.interaction.InteractionConstants;
import fr.exemole.bdfserver.api.interaction.domains.CorpusDomain;
import fr.exemole.bdfserver.api.roles.PermissionSummary;
import fr.exemole.bdfserver.api.ui.IncludeUi;
......@@ -57,7 +58,7 @@ public class IncludeAddendaFormHtmlProducer extends BdfHtmlProducer {
.action(Domains.CORPUS)
.family("CRP")
.page(CorpusDomain.CORPUSINCLUDE_ADDENDAFORM_PAGE)
.mode("fieldset");
.mode(InteractionConstants.SUBUNIT_MODE);
this
.__(startUnit("action-admin-Addenda", "_ title.corpus.addendainclude_list"));
if (list.isEmpty()) {
......
......@@ -11,6 +11,7 @@ package fr.exemole.bdfserver.htmlproducers.corpus;
import fr.exemole.bdfserver.api.BdfContext;
import fr.exemole.bdfserver.api.interaction.Domains;
import fr.exemole.bdfserver.api.interaction.InteractionConstants;
import fr.exemole.bdfserver.api.interaction.domains.CorpusDomain;
import fr.exemole.bdfserver.api.roles.PermissionSummary;
import fr.exemole.bdfserver.api.ui.IncludeUi;
......@@ -57,7 +58,7 @@ public class IncludeAlbumFormHtmlProducer extends BdfHtmlProducer {
.action(Domains.CORPUS)
.family("CRP")
.page(CorpusDomain.CORPUSINCLUDE_ALBUMFORM_PAGE)
.mode("fieldset");
.mode(InteractionConstants.SUBUNIT_MODE);
this
.__(startUnit("action-admin-Album", "_ title.corpus.albuminclude_list"));
......
......@@ -11,6 +11,7 @@ package fr.exemole.bdfserver.htmlproducers.corpus;
import fr.exemole.bdfserver.api.BdfContext;
import fr.exemole.bdfserver.api.interaction.Domains;
import fr.exemole.bdfserver.api.interaction.InteractionConstants;
import fr.exemole.bdfserver.api.interaction.domains.CorpusDomain;
import fr.exemole.bdfserver.api.roles.PermissionSummary;
import fr.exemole.bdfserver.api.ui.CommentUi;
......@@ -60,7 +61,7 @@ public class IncludeCommentFormHtmlProducer extends BdfHtmlProducer {
.action(Domains.CORPUS)
.family("CRP")
.page(CorpusDomain.CORPUSINCLUDE_COMMENTFORM_PAGE)
.mode("fieldset");
.mode(InteractionConstants.SUBUNIT_MODE);
if (list.size() > 0) {
this
.__(startUnit("action-corpus-Comment", "_ title.corpus.comment_list"))
......
......@@ -11,6 +11,7 @@ package fr.exemole.bdfserver.htmlproducers.corpus;
import fr.exemole.bdfserver.api.BdfContext;
import fr.exemole.bdfserver.api.interaction.Domains;
import fr.exemole.bdfserver.api.interaction.InteractionConstants;
import fr.exemole.bdfserver.api.interaction.domains.CorpusDomain;
import fr.exemole.bdfserver.api.roles.PermissionSummary;
import fr.exemole.bdfserver.api.ui.IncludeUi;
......@@ -57,7 +58,7 @@ public class IncludeCorpusFormHtmlProducer extends BdfHtmlProducer {
.action(Domains.CORPUS)
.family("CRP")
.page(CorpusDomain.CORPUSINCLUDE_CORPUSFORM_PAGE)
.mode("fieldset");
.mode(InteractionConstants.SUBUNIT_MODE);
this
.__(startUnit("action-admin-Corpus", "_ title.corpus.corpusinclude_list"));
if (list.isEmpty()) {
......
......@@ -11,6 +11,7 @@ package fr.exemole.bdfserver.htmlproducers.corpus;
import fr.exemole.bdfserver.api.BdfContext;
import fr.exemole.bdfserver.api.interaction.Domains;
import fr.exemole.bdfserver.api.interaction.InteractionConstants;
import fr.exemole.bdfserver.api.interaction.domains.CorpusDomain;
import fr.exemole.bdfserver.api.roles.PermissionSummary;
import fr.exemole.bdfserver.api.ui.IncludeUi;
......@@ -54,7 +55,7 @@ public class IncludeSpecialFormHtmlProducer extends BdfHtmlProducer {
.action(Domains.CORPUS)
.family("CRP")
.page(CorpusDomain.CORPUSINCLUDE_SPECIALFORM_PAGE)
.mode("fieldset");
.mode(InteractionConstants.SUBUNIT_MODE);
this
.__(startUnit("action-corpus-Special", "_ link.corpus.corpusinclude_specialform"))
.DL()
......
......@@ -11,6 +11,7 @@ package fr.exemole.bdfserver.htmlproducers.corpus;
import fr.exemole.bdfserver.api.BdfContext;
import fr.exemole.bdfserver.api.interaction.Domains;
import fr.exemole.bdfserver.api.interaction.InteractionConstants;
import fr.exemole.bdfserver.api.interaction.domains.CorpusDomain;
import fr.exemole.bdfserver.api.roles.PermissionSummary;
import fr.exemole.bdfserver.api.ui.IncludeUi;
......@@ -57,7 +58,7 @@ public class IncludeThesaurusFormHtmlProducer extends BdfHtmlProducer {
.action(Domains.CORPUS)
.family("CRP")
.page(CorpusDomain.CORPUSINCLUDE_THESAURUSFORM_PAGE)
.mode("fieldset");
.mode(InteractionConstants.SUBUNIT_MODE);
this
.__(startUnit("action-admin-Thesaurus", "_ title.corpus.thesaurusinclude_list"));
if (list.isEmpty()) {
......
......@@ -12,6 +12,7 @@ package fr.exemole.bdfserver.htmlproducers.sphere;
import fr.exemole.bdfserver.api.BdfContext;
import fr.exemole.bdfserver.api.interaction.Domains;
import fr.exemole.bdfserver.api.interaction.domains.SphereDomain;
import fr.exemole.bdfserver.api.roles.PermissionSummary;
import fr.exemole.bdfserver.api.users.BdfUser;
import fr.exemole.bdfserver.html.BdfHtmlProducer;
import fr.exemole.bdfserver.html.BdfHtmlUtils;
......@@ -26,18 +27,20 @@ import net.mapeadores.util.html.CommandBox;
*/
public class RedacteurCreationFormHtmlProducer extends BdfHtmlProducer {
private final PermissionSummary permissionSummary;
private final Sphere sphere;
public RedacteurCreationFormHtmlProducer(BdfContext bdfContext, BdfUser bdfUser, Sphere sphere) {
public RedacteurCreationFormHtmlProducer(BdfContext bdfContext, BdfUser bdfUser, PermissionSummary permissionSummary, Sphere sphere) {
super(bdfContext, bdfUser);
addJsLib(CommonJsLibs.COMMANDTEST);
this.permissionSummary = permissionSummary;
this.sphere = sphere;
}
@Override
public void printHtml() {
start();
BdfHtmlUtils.printSubsetHeader(this, sphere, bdfUser.getWorkingLang());
BdfHtmlUtils.printSubsetHeader(this, bdfServer, bdfUser, permissionSummary, sphere, SphereDomain.REDACTEUR_CREATIONFORM_PAGE);
printCommandMessageUnit();
CommandBox commandBox = CommandBox.init()
.action(Domains.SPHERE)
......
......@@ -57,19 +57,9 @@ public class SphereHtmlProducer extends BdfHtmlProducer {
public void printHtml() {
setTitle(FichothequeUtils.getSubsetTitle(sphere, workingLang));
start();
if ((isWithJavascript()) && (isSubsetAdmin)) {
this
.DIV("subset-list-ChangeSelect")
.__(BdfHtmlUtils.printSubsetChangeSelect(this, bdfServer, bdfUser, permissionSummary, sphere.getSubsetKey(), SphereDomain.SPHERE_PAGE))
._DIV();
}
this
.HEADER("subset-Header")
.H1()
.__(BdfHtmlUtils.printSubsetTitle(this, sphere, workingLang, isSubsetAdmin))
._H1()
._HEADER();
this
.DIV("subset-list-Page")
.__(BdfHtmlUtils.printSubsetHeader(this, bdfServer, bdfUser, permissionSummary, sphere, SphereDomain.SPHERE_PAGE))
.DIV("subset-list-Commands")
.__(printCommands())
._DIV();
......@@ -91,7 +81,8 @@ public class SphereHtmlProducer extends BdfHtmlProducer {
._TABLE();
}
this
.__(endUnit());
.__(endUnit())
._DIV();
}
end();
}
......
/* BdfServer_HtmlProducers - Copyright (c) 2012-2019 Vincent Calame - Exemole
/* BdfServer_HtmlProducers - Copyright (c) 2012-2020 Vincent Calame - Exemole
* Logiciel libre donné sous triple licence :
* 1) selon les termes de la CeCILL V2
* 2) selon les termes de l’EUPL V.1.1
......@@ -74,8 +74,8 @@ public final class SphereHtmlProducerFactory {
}
if (page.equals(SphereDomain.REDACTEUR_CREATIONFORM_PAGE)) {
Sphere sphere = getSphere(bdfContext, requestMap, bdfCommandResult);
BdfInstructionUtils.checkGlobalAdminPermission(bdfServer, bdfUser);
return new RedacteurCreationFormHtmlProducer(bdfContext, bdfUser, sphere);
PermissionSummary permissionSummary = BdfInstructionUtils.checkSubsetAdminPermission(bdfServer, bdfUser, sphere);
return new RedacteurCreationFormHtmlProducer(bdfContext, bdfUser, permissionSummary, sphere);
}
if (page.equals(SphereDomain.REDACTEUR_ADMINFORM_PAGE)) {
Redacteur redacteur = getRedacteur(bdfContext, requestMap, bdfCommandResult);
......
......@@ -12,6 +12,7 @@ package fr.exemole.bdfserver.htmlproducers.thesaurus;
import fr.exemole.bdfserver.api.BdfContext;
import fr.exemole.bdfserver.api.interaction.Domains;
import fr.exemole.bdfserver.api.interaction.domains.ThesaurusDomain;
import fr.exemole.bdfserver.api.roles.PermissionSummary;
import fr.exemole.bdfserver.api.users.BdfUser;
import fr.exemole.bdfserver.html.BdfHtmlProducer;
import fr.exemole.bdfserver.html.BdfHtmlUtils;
......@@ -26,19 +27,21 @@ import net.mapeadores.util.html.CommandBox;
*/
public class MotcleCreationFormHtmlProducer extends BdfHtmlProducer {
private final PermissionSummary permissionSummary;
private final Thesaurus thesaurus;
public MotcleCreationFormHtmlProducer(BdfContext bdfContext, BdfUser bdfUser, Thesaurus thesaurus) {
public MotcleCreationFormHtmlProducer(BdfContext bdfContext, BdfUser bdfUser, PermissionSummary permissionSummary, Thesaurus thesaurus) {
super(bdfContext, bdfUser);
addJsLib(CommonJsLibs.COMMANDTEST);
addCssThemeFiles("thesaurus.css");
this.permissionSummary = permissionSummary;
this.thesaurus = thesaurus;
}
@Override
public void printHtml() {
start();
BdfHtmlUtils.printSubsetHeader(this, thesaurus, bdfUser.getWorkingLang());
BdfHtmlUtils.printSubsetHeader(this, bdfServer, bdfUser, permissionSummary, thesaurus, ThesaurusDomain.MOTCLE_CREATIONFORM_PAGE);
printCommandMessageUnit();
CommandBox commandBox = CommandBox.init()
.action(Domains.THESAURUS)
......
/* BdfServer_HtmlProducers - Copyright (c) 2012-2019 Vincent Calame - Exemole
/* BdfServer_HtmlProducers - Copyright (c) 2012-2020 Vincent Calame - Exemole
* Logiciel libre donné sous triple licence :
* 1) selon les termes de la CeCILL V2
* 2) selon les termes de l’EUPL V.1.1
......@@ -70,29 +70,18 @@ public class ThesaurusHtmlProducer extends BdfHtmlProducer {
public void printHtml() {
String thesaurusName = thesaurus.getSubsetKey().getSubsetName();
start();
if ((isWithJavascript()) && (isSubsetAdmin)) {
this
.DIV("subset-list-ChangeSelect")
.__(BdfHtmlUtils.printSubsetChangeSelect(this, bdfServer, bdfUser, permissionSummary, thesaurus.getSubsetKey(), ThesaurusDomain.THESAURUS_PAGE))
._DIV();
}
this
.HEADER("subset-Header")
.H1()
.__(BdfHtmlUtils.printSubsetTitle(this, thesaurus, workingLang, isSubsetAdmin))
._H1()
._HEADER();
this
.DIV("subset-list-Page")
.__(BdfHtmlUtils.printSubsetHeader(this, bdfServer, bdfUser, permissionSummary, thesaurus, ThesaurusDomain.THESAURUS_PAGE))
.DIV("subset-list-Commands")
.__(printCommands())
.__(MainHtmlUtils.printTableDisplayDetails(this, bdfServer, bdfUser, thesaurus, false, HA.id("details_tabledisplay").classes("thesaurus-Details").attr("data-deploy-role", "details")))
.__(printStatsLinks(thesaurusName))
.__(printFilterLinks())
.__(printGoForm(thesaurusName))
._DIV()
.__(printMotcleList())
._DIV();
this
.__(printMotcleList());
end();
}
......
/* BdfServer_HtmlProducers - Copyright (c) 2012-2019 Vincent Calame - Exemole
/* BdfServer_HtmlProducers - Copyright (c) 2012-2020 Vincent Calame - Exemole
* Logiciel libre donné sous triple licence :
* 1) selon les termes de la CeCILL V2
* 2) selon les termes de l’EUPL V.1.1
......@@ -74,8 +74,8 @@ public final class ThesaurusHtmlProducerFactory {
}
if (page.equals(ThesaurusDomain.MOTCLE_CREATIONFORM_PAGE)) {
Thesaurus thesaurus = getThesaurus(bdfContext, requestMap, bdfCommandResult);
BdfInstructionUtils.checkSubsetAdminPermission(bdfServer, bdfUser, thesaurus);
return new MotcleCreationFormHtmlProducer(bdfContext, bdfUser, thesaurus);
PermissionSummary permissionSummary = BdfInstructionUtils.checkSubsetAdminPermission(bdfServer, bdfUser, thesaurus);
return new MotcleCreationFormHtmlProducer(bdfContext, bdfUser, permissionSummary, thesaurus);
}
if (page.equals(ThesaurusDomain.MOTCLE_CHANGEFORM_PAGE)) {
Motcle motcle = getMotcle(bdfContext, requestMap, bdfCommandResult);
......
......@@ -711,16 +711,17 @@ fieldset[data-command-family='ADD'] {
margin-right: 20px;
}
.subset-Category {
font-size: large;
}
.subset-ChangeSelect {
margin-left: 20px;
margin-top: 10px;
margin-bottom: 15px;
color: #2e3436;
text-align: right;
overflow: hidden;
}
.subset-ChangeSelect select {
max-width: calc(100% - 30px);
}
.subset-Header {
......@@ -730,9 +731,10 @@ fieldset[data-command-family='ADD'] {
color: #2e3436;
background-color: #d0d0d0;
padding-left: 8px;
padding-right: 8px;
padding-right: 28px;
padding-bottom: 1px;
padding-top: 1px;
display: inline-block;
}
.subset-Header h1 {
......@@ -742,6 +744,9 @@ fieldset[data-command-family='ADD'] {
flex-wrap: wrap;
flex-grow: 1;
flex-shrink: 1;
font-size: 1em;
margin-top: 8px;
margin-bottom: 8px;
}
.subset-Key {
......@@ -826,10 +831,6 @@ fieldset[data-command-family='ADD'] {
color: #2e3436;
}
.subset-Title {
font-size: large;
}
.subset-Title::before {
content: "\00A0"
}
......@@ -852,16 +853,13 @@ fieldset[data-command-family='ADD'] {
* .subset-list-
*******************************************************************************/
.subset-list-ChangeSelect {
margin-left: 20px;
margin-top: 10px;
margin-bottom: 15px;
color: #2e3436;
overflow: hidden;
.subset-list-Page .subset-ChangeSelect {
text-align: left;
}
.subset-list-ChangeSelect select {
max-width: calc(100% - 30px);
.subset-list-Page .subset-Header {
color: #fff;
background-color: #25617a;
}
.subset-list-Commands {
......@@ -870,6 +868,19 @@ fieldset[data-command-family='ADD'] {
margin-bottom: 15px;
}
.subset-list-Items.unit-Unit {
border-color: #25617a;
}
.subset-list-Items .unit-Header {
border-color: #25617a;
}
.subset-list-Items .unit-Title {
color: #fff;
background-color: #25617a;
}
/*******************************************************************************
* .tools-
......
......@@ -51,7 +51,7 @@ public class CommandBox {
this.mode = commandBox.mode;
this.actionCssClass = commandBox.actionCssClass;
this.helpUrl = commandBox.helpUrl;
this.submitLocKey = submitLocKey;
this.submitLocKey = commandBox.submitLocKey;
}
public CommandBox derive(String name, String lockey) {
......
......@@ -1264,26 +1264,26 @@ public class HtmlPrinter {
}
public HtmlPrinter NAV() {
startTag("section");
startTag("nav");
return this;
}
public HtmlPrinter NAV(String classes) {
openTag("section");
openTag("nav");
printAttribute("class", classes);
closeTag();
return this;
}
public HtmlPrinter NAV(HtmlAttributes htmlAttributes) {
openTag("section");
openTag("nav");
printHTMLAttributes(htmlAttributes);
closeTag();
return this;
}
public HtmlPrinter _NAV() {
endTag("section");
endTag("nav");
__breakLine();
return this;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment