Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1288f4d9ebf6
Choose a base ref
...
head repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4f9a2793b750
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 24, 2014

  1. TRUNK-2984 Improved UI for notiications

    @kushal8
    kushal8 committed Jan 24, 2014
    Copy the full SHA
    5721191 View commit details

Commits on Jan 30, 2014

  1. TRUNK-2984 ver 2

    @kushal8
    kushal8 committed Jan 30, 2014

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f56438d View commit details

  2. Merge pull request #581 from kushal8/TRUNK-2984 

    TRUNK-2984 Improved UI for notiications
    @dkayiwa
    dkayiwa committed Jan 30, 2014
    Copy the full SHA
    4f9a279 View commit details
Showing with 15 additions and 9 deletions.
  1. +1 −1 webapp/src/main/webapp/WEB-INF/messages.properties
  2. +14 −8 webapp/src/main/webapp/WEB-INF/template/headerFull.jsp
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/WEB-INF/messages.properties
View file
Original file line number Diff line number Diff line change
@@ -425,7 +425,7 @@ Alert.mark=Mark this Alert as Read
Alert.markAsRead=Mark as Read
Alert.markAllAsRead=Mark all as Read
Alert.markAllAlertsAsRead=Mark all alerts as Read
Alert.mark.satisfiedByAny='Reading' this alert 'reads' it for all recipients
Alert.mark.satisfiedByAny=Marking an alert as Read will hide it for all other users too
Alert.unreadAlert=You have <span id="unreadAlertSize">1</span> unread alert
Alert.unreadAlerts=You have <span id="unreadAlertSize">{0}</span> unread alerts
Alert.assignedTo=Assigned To
22 changes: 14 additions & 8 deletions webapp/src/main/webapp/WEB-INF/template/headerFull.jsp
View file
Original file line number Diff line number Diff line change
@@ -138,23 +138,29 @@
<div id="content">

<openmrs:forEachAlert>
<c:if test="${varStatus.first}"><div id="alertOuterBox"><div id="alertInnerBox"></c:if>
<div class="alert">
<a href="#markRead" onClick="return markAlertRead(this, '${alert.alertId}')" HIDEFOCUS class="markAlertRead">
<img src="${pageContext.request.contextPath}/images/markRead.gif" alt='<openmrs:message code="Alert.mark"/>' title='<openmrs:message code="Alert.mark"/>'/> <span class="markAlertText"><openmrs:message code="Alert.markAsRead"/></span>
</a>
${alert.text} ${alert.dateToExpire} <c:if test="${alert.satisfiedByAny}"><i class="smallMessage">(<openmrs:message code="Alert.mark.satisfiedByAny"/>)</i></c:if>
</div>
<c:if test="${varStatus.first}"><div id="alertOuterBox"></c:if>
<c:if test="${varStatus.last}">
</div>
<div id="alertBar">
<img src="${pageContext.request.contextPath}/images/alert.gif" align="center" alt='<openmrs:message htmlEscape="false" code="Alert.unreadAlert"/>' title='<openmrs:message htmlEscape="false" code="Alert.unreadAlert"/>'/>
<c:if test="${varStatus.count == 1}"><openmrs:message htmlEscape="false" code="Alert.unreadAlert"/></c:if>
<c:if test="${varStatus.count != 1}"><openmrs:message htmlEscape="false" code="Alert.unreadAlerts" arguments="${varStatus.count}" /></c:if>
<c:if test="${alert.satisfiedByAny}"><i class="smallMessage">(<openmrs:message code="Alert.mark.satisfiedByAny"/>)</i></c:if>
<a href="#markAllAsRead" onclick="return markAllAlertsRead(this)" HIDEFOCUS class="markAllAsRead" >
<img src="${pageContext.request.contextPath}/images/markRead.gif" alt='<openmrs:message code="Alert.markAllAsRead"/>' title='<openmrs:message code="Alert.markAllAlertsAsRead"/>' /> <span class="markAllAsRead"><openmrs:message code="Alert.markAllAsRead"/></span>
</a>
</div>
</c:if>
</openmrs:forEachAlert>
<openmrs:forEachAlert>
<c:if test="${varStatus.first}"><div id="alertInnerBox"></c:if>
<div class="alert">
<a href="#markRead" onClick="return markAlertRead(this, '${alert.alertId}')" HIDEFOCUS class="markAlertRead">
<img src="${pageContext.request.contextPath}/images/markRead.gif" alt='<openmrs:message code="Alert.mark"/>' title='<openmrs:message code="Alert.mark"/>'/> <span class="markAlertText"><openmrs:message code="Alert.markAsRead"/></span>
</a>
${alert.text} ${alert.dateToExpire}
</div>
<c:if test="${varStatus.last}">
</div>
</div>
</c:if>
</openmrs:forEachAlert>