From 8d4b354199266470b707785eefedc6525ab4ee5f Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Mon, 15 Oct 2018 16:51:44 +0200
Subject: [PATCH] [bug] change group button overflow

---
 CHANGELOG.md                                               | 2 ++
 .../javascripts/controllers/admin/calendar.coffee.erb      | 2 +-
 app/assets/stylesheets/app.buttons.scss                    | 7 +++++++
 app/assets/templates/plans/index.html.erb                  | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b35c0403..f40d21283 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog Fab Manager
 
+- Fix a bug: on small screens, display of button "change group" overflow
+
 ## v2.6.7 2018 October 4
 
 - Ability to configure SMTP more precisely
diff --git a/app/assets/javascripts/controllers/admin/calendar.coffee.erb b/app/assets/javascripts/controllers/admin/calendar.coffee.erb
index a69cbf5fe..de9a62e6b 100644
--- a/app/assets/javascripts/controllers/admin/calendar.coffee.erb
+++ b/app/assets/javascripts/controllers/admin/calendar.coffee.erb
@@ -207,7 +207,7 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
     start = moment.tz(start.toISOString(), Fablab.timezone)
     end = moment.tz(end.toISOString(), Fablab.timezone)
     # first we check that the selected slot is an N-hours multiple (ie. not decimal)
-    if Number.isInteger(parseInt((end.valueOf() - start.valueOf()) / (SLOT_MULTIPLE * 1000), 10)/SLOT_MULTIPLE)
+    if Number.isInteger(parseInt((end.valueOf() - start.valueOf()) / (SLOT_MULTIPLE * 1000), 10) / SLOT_MULTIPLE)
       today = new Date()
       if (parseInt((start.valueOf() - today) / (60 * 1000), 10) >= 0)
         # then we open a modal window to let the admin specify the slot type
diff --git a/app/assets/stylesheets/app.buttons.scss b/app/assets/stylesheets/app.buttons.scss
index 5f8c187ad..76fd2cf50 100644
--- a/app/assets/stylesheets/app.buttons.scss
+++ b/app/assets/stylesheets/app.buttons.scss
@@ -77,6 +77,13 @@
   animation:spin 4s linear infinite;
 }
 
+.btn-no-overflow {
+  display: block;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 @-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
 @-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
 @keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }
diff --git a/app/assets/templates/plans/index.html.erb b/app/assets/templates/plans/index.html.erb
index 6362ac2d5..174a71d62 100644
--- a/app/assets/templates/plans/index.html.erb
+++ b/app/assets/templates/plans/index.html.erb
@@ -95,7 +95,7 @@
               <div class="well well-warning">
                   <strong>{{getUserGroup().name}}</strong>
               </div>
-              <button class="btn btn-default m-t"
+              <button class="btn btn-default btn-no-overflow m-t"
                       ng-click="group.change = !group.change"
                       ng-show="(!selectedPlan && ctrl.member && !ctrl.member.subscribed_plan && ctrl.member.subscription) || (!paid.plan)"
                       translate