Merge pull request #125 from jonaslozys/bugfix/event-leave-translation

Fix event leave LT translation and event dropdown UX
VismaLietuva · Jan 27, 2020 · 03d80c5 · 03d80c5
2 parents 15ca386 + c004a5c
commit 03d80c5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/webapp/src/client/app/events/join/join.html b/src/webapp/src/client/app/events/join/join.html
@@ -36,7 +36,7 @@
             <span class="caret"></span>
         </button>
 
-        <ul class="dropdown-menu dropdown-menu-right dropdown-menu-wide">
+        <ul class="dropdown-menu dropdown-menu-right dropdown-menu-wide participate-dropdown-menu">
             <li><a ng-if="vm.event.participatingStatus != vm.attendStatus.Attending" class="nc-btn nc-btn-default"
                     ng-click="vm.joinEvent(vm.event.id)" translate-attr-title="events.eventJoin"
                     data-test-id="join-event-attending-button" translate>
@@ -52,6 +52,7 @@
                     data-test-id="join-event-notattending-button" translate>
                     <span class="vismaicon vismaicon-cancel-circle"></span><span translate="events.eventAction_NotAttending"></span></a>
             </li>
+            <li><hr class="event-participate-dropdown-hr-line" ng-if="vm.event.participatingStatus != vm.attendStatus.Idle"/></li>
             <li><a ng-if="vm.event.participatingStatus != vm.attendStatus.Idle" class="nc-btn nc-btn-danger"
                     ng-click="vm.leaveEvent(vm.event.id, '')" translate-attr-title="events.eventLeave"
                     data-test-id="join-event-leave-button" translate>

diff --git a/src/webapp/src/client/resources/lt_LT/events.json b/src/webapp/src/client/resources/lt_LT/events.json
@@ -63,7 +63,7 @@
   "wrongNumber": "Netinkamas skaičius",
   "export": "Eksportuoti",
   "attend": "Dalyvausiu",
-  "eventLeave": "Nedalyvausiu",
+  "eventLeave": "Palikti",
   "areYouGoing": "Dalyvausi?",  
   "eventAction_Attending": "Dalyvausiu",
   "eventAction_MaybeAttending": "Gal dalyvausiu",

diff --git a/src/webapp/src/client/styles/style/modules/_events.less b/src/webapp/src/client/styles/style/modules/_events.less
@@ -183,6 +183,15 @@
     right: 65px !important;
 }
 
+.event-participate-dropdown-hr-line {
+    margin: 5px;
+}
+
+.participate-dropdown-menu {
+    padding: 5px 0px 5px 0px;
+    width: 100%;
+}
+
 .event-attend-dropdown-button {
     margin-top: 10px;
 }