Skip to content
Snippets Groups Projects
Commit d55110d4 authored by Mohammed Sayed's avatar Mohammed Sayed
Browse files

ISSUE-208 Layout improvements (Email 07.10) and margin-right for all buttons

parent d53a438b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 40 deletions
bwreg-webapp/src/main/resources/META-INF/resources/primefaces-kit-theme/theme.css
+ 1
− 1
View file @ d55110d4
Source diff could not be displayed: it is too large. Options to address this: view the blob.
bwreg-webapp/src/main/resources/msg/messages_de.properties
+ 1
− 4
View file @ d55110d4
......@@ -939,16 +939,13 @@ project.parent_project = \u00DCbergeordnetes Pr
project.parent_project.none_selected = Kein \u00FCbergeordnetes Projekt
project.projects = Projekte
project.short_description = Kurze Beschreibung
project.show_local_project.connect_to_service_link = Mit Dienst verbinden
project.show_local_project.connect_to_service_link_text = Hier k\u00F6nnen Sie die Nutzung einer Resource f\u00FCr Ihr Projekt beantragen.
project.show_local_project.connect_to_service_link = Weitere Dienste verkn\u00FCpfen
project.show_local_project.create_sub_project = Unterprojekt anlegen
project.show_local_project.create_sub_project_text = Erstellen Sie ein Unterprojekt f\u00FCr Ihr Projekt.
project.show_local_project.delete_member_confirm = M\u00F6chten Sie das Projektmitglied aus dem Projekt entfernen?
project.show_local_project.delete_project_link = Projekt l\u00F6schen
project.show_local_project.delete_project_link_text = \u00D6ffnet eine neue Seite, auf der das Projekt gel\u00F6scht werden kann.
project.show_local_project.edit_project_admins_link = Projektrollen verwalten
project.show_local_project.invite_to_project_link = Mitglieder einladen
project.show_local_project.invite_to_project_link_text = Laden Sie Mitglieder f\u00FCr Ihr Projekt ein. Die Einladung erfolgt \u00FCber eine E-Mail mit einem Einladungscode.
project.show_local_project.manage_oidc_credentials = OIDC Clients
project.show_local_project.manage_oidc_credentials_text = Verwalten Sie OpenID Connect Clients f\u00FCr Ihr Projekt.
......
bwreg-webapp/src/main/resources/msg/messages_en.properties
+ 1
− 4
View file @ d55110d4
......@@ -937,16 +937,13 @@ project.parent_project = Parent project
project.parent_project.none_selected = No parent project selected
project.projects = Projects
project.short_description = Short description
project.show_local_project.connect_to_service_link = Connect with service
project.show_local_project.connect_to_service_link_text = Here you can request the use of a resource for your project.
project.show_local_project.connect_to_service_link = Link further services
project.show_local_project.create_sub_project = Create subproject
project.show_local_project.create_sub_project_text = Create a subproject for your project.
project.show_local_project.delete_member_confirm = Do you want to remove the project member from the project?
project.show_local_project.delete_project_link = Delete project
project.show_local_project.delete_project_link_text = Opens a new page on which the project can be deleted.
project.show_local_project.edit_project_admins_link = Manage project roles
project.show_local_project.invite_to_project_link = Invite members
project.show_local_project.invite_to_project_link_text = Invite members for your project. The invitation is done via an email with an invitation code.
project.show_local_project.manage_oidc_credentials = OIDC Clients
project.show_local_project.manage_oidc_credentials_text = Manage OpenID Connect clients for your project.
......
bwreg-webapp/src/main/resources/msg/messages_fr.properties
+ 1
− 4
View file @ d55110d4
......@@ -937,16 +937,13 @@ project.parent_project = Projet parent
project.parent_project.none_selected = Aucun projet parent s\u00E9lectionn\u00E9
project.projects = Projets
project.short_description = Br\u00E8ve description
project.show_local_project.connect_to_service_link = Connecter au service
project.show_local_project.connect_to_service_link_text = Ici, vous pouvez demander l'utilisation d'une ressource pour votre projet.
project.show_local_project.connect_to_service_link = Liens vers d'autres services
project.show_local_project.create_sub_project = Cr\u00E9er un sous-projet
project.show_local_project.create_sub_project_text = Cr\u00E9ez un sous-projet pour votre projet.
project.show_local_project.delete_member_confirm = Souhaitez-vous retirer le membre du projet ?
project.show_local_project.delete_project_link = Supprimer le projet
project.show_local_project.delete_project_link_text = Ouvre une nouvelle page sur laquelle le projet peut \u00EAtre supprim\u00E9.
project.show_local_project.edit_project_admins_link = G\u00E9rer les r\u00F4les de projet
project.show_local_project.invite_to_project_link = Inviter des membres
project.show_local_project.invite_to_project_link_text = Invitez des membres pour votre projet. L'invitation se fait par un e-mail avec un code d'invitation.
project.show_local_project.manage_oidc_credentials = OIDC Clients
project.show_local_project.manage_oidc_credentials_text = G\u00E9rer les clients OpenID Connect pour votre projet.
......
bwreg-webapp/src/main/webapp/project/connect-local-project-to-service.xhtml
+ 4
− 5
View file @ d55110d4
......@@ -21,9 +21,9 @@
<ui:define name="content">
<h:form id="form" class="full">
<h2><h:outputText value="#{messages['project.connect_to_service']}: #{connectLocalProjectToServiceBean.entity.name}"/></h2>
<p:messages id="messageBox" showDetail="true" />
<h:panelGrid id="baseData" columns="2" layout="flex" columnClasses="col-12 md:col-3 xl:col-3, col-12 md:col-9 xl:col-9">
......@@ -57,7 +57,6 @@
<h:outputText value="#{messages['project.connect_to_service_connect_text']}" />
</div>
<p:panel id="policyHolderList">
<p:panel style="margin: 1.5em 0.5em;" rendered="#{connectLocalProjectToServiceBean.policyHolderList.size() != 0}">
<ui:repeat var="policyHolder" value="#{connectLocalProjectToServiceBean.policyHolderList}">
......@@ -66,8 +65,8 @@
<h:outputText value="#{bbCodeConverter.convert(policyHolder.policy.actualAgreement.agreement)}" escape="false"/>
</div>
<p:outputPanel rendered="#{not policyHolder.policy.showOnly}" style="margin-top: 1em;">
<h:selectBooleanCheckbox value="#{policyHolder.checked}" />
<h:outputText value="#{messages.accept_tou}" />
<p:selectBooleanCheckbox value="#{policyHolder.checked}" />
<h:outputText style="font-weight: bold; margin-left: 0.7em; padding-top: 0.4em;" value="#{messages.accept_tou}" />
</p:outputPanel>
</ui:repeat>
</p:panel>
......
bwreg-webapp/src/main/webapp/project/show-local-project.xhtml
+ 24
− 21
View file @ d55110d4
......@@ -59,24 +59,22 @@
</ul>
</h:panelGroup>
<h:outputText value="#{messages.services}:"/>
<ui:repeat value="#{userShowLocalProjectBean.entity.projectServices}" var="s">
<h:outputText style="font-weight:bold;" value="#{messages.available_services}:"/>
<ui:repeat style="font-weight:bold;" value="#{userShowLocalProjectBean.entity.projectServices}" var="s">
<div><h:outputText value="#{s.service.name} (#{s.status})"/></div>
</ui:repeat>
</h:panelGrid>
<h:panelGrid style="margin-top:1em;" columns="2" layout="flex" columnClasses="col-12 md:col-3 xl:col-3, col-12 md:col-9 xl:col-9">
<h:outputLink value="connect-local-project-to-service.xhtml" >
<h:panelGrid style="margin-top:1em;" id="baseData2" columns="2" layout="flex" columnClasses="col-12 md:col-3 xl:col-3, col-12 md:col-9 xl:col-9" rowClasses="white-row">
<h:outputText value=""/>
<h:outputLink style="font-weight:bold;" value="connect-local-project-to-service.xhtml" >
<h:outputText value="#{messages['project.show_local_project.connect_to_service_link']}"/>
<f:param name="id" value="#{userShowLocalProjectBean.entity.id}"/>
</h:outputLink>
<h:outputText value="#{messages['project.show_local_project.connect_to_service_link_text']}" />
</h:panelGrid>
<h:outputLink value="invite-to-project.xhtml">
<h:outputText value="#{messages['project.show_local_project.invite_to_project_link']}"/>
<f:param name="id" value="#{userShowLocalProjectBean.entity.id}"/>
</h:outputLink>
<h:outputText value="#{messages['project.show_local_project.invite_to_project_link_text']}" />
<h:panelGrid style="margin-top:1em;" columns="2" layout="flex" columnClasses="col-12 md:col-3 xl:col-3, col-12 md:col-9 xl:col-9"
rendered="#{not empty userShowLocalProjectBean.entity.approved or userShowLocalProjectBean.entity.subProjectsAllowed}">
<h:outputLink value="oidc/list-clients.xhtml"
rendered="#{userShowLocalProjectBean.entity.approved}">
......@@ -91,18 +89,9 @@
<f:param name="id" value="#{userShowLocalProjectBean.entity.id}"/>
</h:outputLink>
<h:outputText value="#{messages['project.show_local_project.create_sub_project_text']}" rendered="#{userShowLocalProjectBean.entity.subProjectsAllowed}"/>
<h:outputLink value="delete-local-project.xhtml" >
<h:outputText value="#{messages['project.show_local_project.delete_project_link']}"/>
<f:param name="id" value="#{userShowLocalProjectBean.entity.id}"/>
</h:outputLink>
<h:outputText value="#{messages['project.show_local_project.delete_project_link_text']}" />
</h:panelGrid>
<div class="text full" style="margin-top: 0.4em;">
<a href="index.xhtml"><h:outputText value="#{messages.back}"/></a>
</div>
<h5 style="margin-top: 1em;"><h:outputText value="#{messages['project.members']}" /></h5>
<p:dataTable id="dataTableMember" var="member" value="#{userShowLocalProjectBean.memberList}"
style="width:auto; font-size: 1.2rem;">
......@@ -140,6 +129,11 @@
</p:column>
</p:dataTable>
<h:outputLink value="invite-to-project.xhtml">
<h:outputText value="#{messages['project.show_local_project.invite_to_project_link']}"/>
<f:param name="id" value="#{userShowLocalProjectBean.entity.id}"/>
</h:outputLink>
<h5 style="margin-top: 1em;"><h:outputText value="#{messages['project.admins']}" /></h5>
<p:dataTable id="dataTableAdmin" var="a" value="#{userShowLocalProjectBean.adminList}"
style="width:auto; font-size: 1.2rem;">
......@@ -189,6 +183,15 @@
<p:commandButton value="#{messages.yes}" type="button" styleClass="ui-confirmdialog-yes"/>
<p:commandButton value="#{messages.no}" type="button" styleClass="ui-confirmdialog-no"/>
</p:confirmDialog>
<h:outputLink value="delete-local-project.xhtml" >
<h:outputText value="#{messages['project.show_local_project.delete_project_link']}"/>
<f:param name="id" value="#{userShowLocalProjectBean.entity.id}"/>
</h:outputLink>
<div class="text full" style="margin-top: 0.4em;">
<a href="index.xhtml"><h:outputText value="#{messages.back}"/></a>
</div>
</h:form>
......
bwreg-webapp/src/main/webapp/resources/css/std-ext.css
+ 9
− 0
View file @ d55110d4
......@@ -78,3 +78,12 @@ body .ui-selectonelistbox .ui-selectlistbox-listcontainer .ui-selectlistbox-item
body .ui-commandlink {
color: var(--primaryDarkColor);
}
body a {
color: var(--primaryDarkColor);
font-weight: 400;
}
body a ,body a:hover{
color: var(--primaryDarkColor);
}
bwreg-webapp/src/main/webapp/user/email-addresses.xhtml
+ 1
− 1
View file @ d55110d4
......@@ -53,7 +53,7 @@
<ui:repeat var="email" value="#{emailAddressesBean.identity.emailAddresses}">
<h:panelGroup layout="block" styleClass="col-12 md:col-3 xl:col-3, col-12 md:col-9 xl:col-9"
style="margin: 1em; background-color: #f8f9fa;border: 1px solid #dee2e6;">
style="margin: 0.5em; background-color: #f8f9fa;border: 1px solid #dee2e6;">
<div>
<b><h:outputText value="#{email.emailAddress}"/></b>
</div>
......
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

Help | Imprint | Privacy policy | Accessibility | Contact