Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SAK-49128 Signup dark mode fixes #13028

Merged
merged 4 commits into from
Nov 19, 2024
Merged

SAK-49128 Signup dark mode fixes #13028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ebd09f
SAK-49128 Signup dark mode fixes
ottenhoff Nov 18, 2024
2eb33cf
Merge branch 'master' into SAK-49128
ottenhoff Nov 19, 2024
31bbd65
Merge branch 'master' into SAK-49128
ottenhoff Nov 19, 2024
6243479
Merge branch 'master' into SAK-49128
ottenhoff Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions signup/tool/src/webapp/css/signupStyle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ table.signupTable th {
padding: .3em 1em;
}

table.signupTable tr.evenRow {
background: #f8f8f8;
}

table.signupTable tr.recurRow {
display: table-row;
background-color: #EEF3F6; /*#FFFFCC*/
Expand Down Expand Up @@ -204,10 +200,6 @@ table.organizerAction td.attName {
background: rgb(221, 221, 221);
}

.evenRow {
background: rgb(248, 248, 248);
}

table.organizer td {
padding: .15em 0em 0em 1em;
text-align: left;
Expand Down
2 changes: 1 addition & 1 deletion signup/tool/src/webapp/signup/attendee/signupMeeting.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
rendered="#{AttendeeSignupMBean.meetingWrapper.meeting.meetingType !='announcement'}"
columnClasses="attendeeSignupTSCol,attendeeSignupAvailCol,attendeeInfoCol,attendeeSignupCol,attendeeSignupCol"
rowClasses="oddRow,evenRow"
styleClass="signupTable" style="width: 98%">
styleClass="signupTable table table-striped" style="width: 98%">
<h:column>
<f:facet name="header">
<h:outputText value="#{msgs.tab_time_slot}" />
Expand Down
18 changes: 10 additions & 8 deletions signup/tool/src/webapp/signup/newMeeting/step1.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,15 @@
</h:dataTable>

<h:panelGroup rendered="#{NewSignupMeetingBean.otherSitesAvailability}">
<h:outputText value="<span id='imageOpen_otherSites' style='display:none'>" escape="false"/>
<h:graphicImage value="/images/minus.gif" alt="open" style="border:none;cursor:pointer;" styleClass="openCloseImageIcon" onclick="showDetails('imageOpen_otherSites','imageClose_otherSites','otherSites');" />
<h:outputText value="</span>" escape="false" />
<h:outputText value="<span id='imageClose_otherSites'>" escape="false"/>
<h:graphicImage value="/images/plus.gif" alt="close" style="border:none;cursor:pointer;" styleClass="openCloseImageIcon" onclick="showDetails('imageOpen_otherSites','imageClose_otherSites','otherSites');"/>
<h:outputText value="</span>" escape="false" />
<h:outputLabel value="#{msgs.event_other_sites}" style='font-weight:bold;cursor:pointer;' onmouseover='style.color=\"blue\"' onmouseout='style.color=\"black\"' onclick="showDetails('imageOpen_otherSites','imageClose_otherSites','otherSites');"/>
<span id="imageOpen_otherSites" style="display:none">
<span class="fa fa-minus" aria-hidden="true" style="cursor:pointer" onclick="showDetails('imageOpen_otherSites','imageClose_otherSites','otherSites');"></span>
</span>
<span id="imageClose_otherSites">
<span class="fa fa-plus" aria-hidden="true" style="cursor:pointer" onclick="showDetails('imageOpen_otherSites','imageClose_otherSites','otherSites');"></span>
</span>
<span style="font-weight:bold;cursor:pointer;" onclick="showDetails('imageOpen_otherSites','imageClose_otherSites','otherSites');">
<h:outputText value="#{msgs.event_other_sites}" escape="false"/>
</span>
</h:panelGroup>
<h:panelGroup>
<h:outputText value="<div id='otherSites' style='display:none'>" escape="false"/>
Expand Down Expand Up @@ -465,7 +467,7 @@
</h:commandLink>
<h:panelGroup rendered="#{NewSignupMeetingBean.userDefineTimeslotBean.userEverCreateCTS}">
<h:commandLink action="#{NewSignupMeetingBean.editUserDefTimeSlots}" >
<h:graphicImage value="/images/cal.gif" alt="" style="border:none;cursor:pointer; padding-right:5px;" styleClass="openCloseImageIcon" />
<span class="fa fa-plus" aria-hidden="true" style="padding-right:5px;"></span>
<h:outputText value="#{msgs.label_edit_timeslots}" escape="false" styleClass="activeTag"/>
</h:commandLink>
</h:panelGroup>
Expand Down
2 changes: 1 addition & 1 deletion signup/tool/src/webapp/signup/newMeeting/step2.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
<h:panelGroup styleClass="col-xs-12 col-md-9 valueColumn" layout="block" rendered="#{NewSignupMeetingBean.customTimeslotType}">
<h:dataTable id="scheduleDetail_2" value="#{NewSignupMeetingBean.customTimeSlotWrpList}" var="timeSlot"
rowClasses="oddTimeSlotRow,evenTimeSlotRow" columnClasses="timeslotCol,assignStudentsCol"
styleClass="signupTable" style="display:none; width: 55%">
styleClass="signupTable table table-striped" style="display:none; width: 55%">
<h:column>
<f:facet name="header">
<h:outputText value="#{msgs.tab_time_slot}"/>
Expand Down
2 changes: 1 addition & 1 deletion signup/tool/src/webapp/signup/organizer/orgSignupMeeting.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@
rendered="#{!OrganizerSignupMBean.announcementType}"
columnClasses="orgTimeslotCol,orgMaxAttsCol,orgSlotStatusCol,orgGroupSync,orgWaiterStatusCol"
rowClasses="oddRow,evenRow"
styleClass="signupTable">
styleClass="signupTable table table-striped">
<!-- TS start and end times -->
<h:column>
<f:facet name="header">
Expand Down
12 changes: 6 additions & 6 deletions signup/tool/src/webapp/signup/organizer/userDefTsBlocks.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,15 +221,15 @@
<h:outputText id="addMoreTS_1" value ="&nbsp;" escape="false" styleClass="titleText" />
<h:panelGrid columns="1" id="addMoreTS_2">
<h:commandLink id="cmdlnk90" onclick="SPNR.disableControlsAndSpin(this, null);" action="#{UserDefineTimeslotBean.addOneTSBlock}" styleClass="activeTag" actionListener="#{UserDefineTimeslotBean.validateTimeslots}">
<h:graphicImage value="/images/plus.gif" alt="close" style="border:none;cursor:pointer;" styleClass="openCloseImageIcon" />
<h:outputLabel value="#{msgs.add_more_ts}" style="font-weight:bold" styleClass="activeTag"/>
<span class="fa fa-plus" aria-hidden="true"></span>
<h:outputLabel value="#{msgs.add_more_ts}" styleClass="activeTag"/>
</h:commandLink>
</h:panelGrid>

<h:panelGroup styleClass="longtext" >
<h:selectBooleanCheckbox value="#{UserDefineTimeslotBean.putInMultipleCalendarBlocks}"/>
<h:outputText value="#{msgs.put_In_Multiple_Calendar_Blocks_at_ScheduleTool}" escape="false"/>
</h:panelGroup>
<div class="mt-3 form-check">
<h:selectBooleanCheckbox value="#{UserDefineTimeslotBean.putInMultipleCalendarBlocks}" styleClass="form-check-input"/>
<h:outputText value="#{msgs.put_In_Multiple_Calendar_Blocks_at_ScheduleTool}" escape="false" styleClass="form-check-label"/>
</div>


<sakai:button_bar>
Expand Down
Loading