Merge branch 'master' of github.com:tracim/tracim

tracim/tracim/public/assets/css/dashboard.css

@@ -390,3 +390,11 @@ span.info.readonly {
 .threads-history-reverse > i {
   font-size: 12px;
 }
+
+.user-edit-form__calendar__url {
+  padding: 8px 15px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  background-color: #eee;
+  color: #555;
+}

tracim/tracim/public/assets/js/main.js

@@ -13,4 +13,5 @@ $(document).ready(function () {
       }
     })
   }
+
 })

tracim/tracim/templates/user_edit_me.mak

@@ -5,3 +5,9 @@
 
 ${FORMS.USER_EDIT_FORM('user-edit-form', result.user, tg.url('/user/{}?_method=PUT'.format(result.user.id)), next_url=fake_api.next_url)}
 
+<script type="text/javascript">
+  // add select2 for timezone in user edit profile modale
+  $('#timezone').select2({
+    dropdownParent: $("#user-edit-form") // this is a workaround to make select works inside bootstrap modal
+  })
+</script>

tracim/tracim/templates/user_workspace_forms.mak

@@ -57,7 +57,7 @@
                 <span class="pull-right t-modal-form-submit-button">
                     <button id="${dom_id}-submit-button" type="submit" class="btn btn-small btn-success" title="${_('Create this page')}"><i class=" fa fa-check"></i> ${_('Validate')}</button>
                 </span>
-                
+
                 <div style="clear: both;"></div>
             </form>
         </div>
@@ -80,7 +80,7 @@
                 <span class="pull-right t-modal-form-submit-button">
                     <button id="${dom_id}-submit-button" type="submit" class="btn btn-small btn-success" title="${_('Create this page')}"><i class=" fa fa-check"></i> ${_('Validate')}</button>
                 </span>
-                
+
                 <div style="clear: both;"></div>
             </form>
         </div>
@@ -113,7 +113,7 @@
             <div class="form-group">
                 <label for="calendar">${_('Personal calendar')}</label>
                 <span class="info readonly">${_('This calendar URL will work with CalDav compatibles clients')}</span>
-                <input id="calendar" type="text" class="form-control"  disabled="disabled" value="${user.calendar_url}" />
+                <div class="user-edit-form__calendar__url">${user.calendar_url}</div>
             </div>
             <div class="form-group">
                 <label for="timezone">${_('Timezone')}</label>