Browse Source

UI-1490: Fix monster-link in SmartPBX

4.3
Jean-Roch Maitre 11 years ago
parent
commit
4228cef0c3
13 changed files with 79 additions and 57 deletions
  1. +43
    -0
      style/app.css
  2. +1
    -1
      submodules/devices/devices.css
  3. +4
    -0
      submodules/groups/groups.css
  4. +6
    -8
      submodules/strategy/strategy.css
  5. +16
    -39
      submodules/users/users.css
  6. +1
    -1
      submodules/vmboxes/vmboxes.css
  7. +1
    -1
      views/callLogs-cdrsList.html
  8. +1
    -1
      views/strategy-calls.html
  9. +1
    -1
      views/strategy-confnum.html
  10. +1
    -1
      views/strategy-holidays.html
  11. +1
    -1
      views/strategy-hours.html
  12. +2
    -2
      views/strategy-menuPopup.html
  13. +1
    -1
      views/strategy-numbers.html

+ 43
- 0
style/app.css View File

@ -14,4 +14,47 @@
#voip_container .left-menu > div {
margin-top: 10px;
}
/* Feature Popups */
.feature-popup-container {
width: 510px;
}
.feature-popup-container .actions,
.feature-popup-container .content {
padding: 15px 25px;
border-top: 1px solid #ccc;
}
.feature-popup-container .actions .monster-link {
margin-right: 10px;
}
.feature-popup-container .switch {
display: inline-block;
margin-left: 15px;
}
.feature-popup-container .content.disabled {
display: none;
}
.feature-popup-container form {
margin-bottom: 40px;
}
.feature-popup-container form .main-line {
position: relative;
height: 70px; /* Adding extra space for validation messages */
line-height: 60px;
}
.feature-popup-container form .main-line label.monster-invalid {
top: 45px;
}
.feature-popup-container input,
.feature-popup-container select {
margin-left: 10px;
}

+ 1
- 1
submodules/devices/devices.css View File

@ -236,7 +236,7 @@
}
.edit-device .actions button {
margin-left: 5px;
margin-left: 10px;
}
.edit-device .title-bar {


+ 4
- 0
submodules/groups/groups.css View File

@ -225,6 +225,10 @@
line-height: 30px;
}
#groups_container .actions .cancel-link {
margin-right: 10px;
}
#groups_container .actions:before {
position: absolute;
top: -2px;


+ 6
- 8
submodules/strategy/strategy.css View File

@ -89,7 +89,7 @@
}
#strategy_container .element-container .basic-actions .cancel-link {
margin-right: 40px;
margin-right: 10px;
vertical-align: middle;
}
@ -150,10 +150,13 @@
#strategy_container .element-container .number-actions {
padding: 25px 20px;
line-height: 30px;
background-color: #f3f3f3;
}
#strategy_container .element-container .number-actions .action-links a {
margin-right: 10px;
}
#strategy_container .element-container .number-actions .action-links a i {
margin-right: 5px;
}
@ -582,18 +585,13 @@
display: none;
}
#strategy_menu_popup .menu-block .add-menu-line a {
color: #22a5ff;
text-decoration: underline;
}
#strategy_menu_popup .menu-block .add-menu-line {
margin-top: 10px;
}
#strategy_menu_popup .action-block .cancel-link {
line-height: 30px;
margin-right: 40px;
margin-right: 10px;
color: #22a5ff;
}


+ 16
- 39
submodules/users/users.css View File

@ -233,6 +233,10 @@
line-height: 30px;
}
#users_container .actions .cancel-link {
margin-right: 10px;
}
#users_container .actions:before {
position: absolute;
top: -2px;
@ -243,6 +247,10 @@
content: "";
}
#users_container .actions .spare-link {
margin-right: 10px;
}
/* Detail User */
#users_container .detail-user .user-fields {
-webkit-box-sizing: border-box;
@ -357,6 +365,10 @@
margin-left: 10px;
}
#users_container .detail-user #change_pin {
margin-left: 10px;
}
/* Grid add remove */
#users_container .list-wrapper {
margin: 10px;
@ -628,45 +640,6 @@
width: 153px;
}
/* Feature Popups */
.feature-popup-container {
width: 510px;
}
.feature-popup-container .actions,
.feature-popup-container .content {
padding: 15px 25px;
border-top: 1px solid #ccc;
}
.feature-popup-container .switch {
display: inline-block;
margin-left: 15px;
}
.feature-popup-container .content.disabled {
display: none;
}
.feature-popup-container form {
margin-bottom: 40px;
}
.feature-popup-container form .main-line {
position: relative;
height: 70px; /* Adding extra space for validation messages */
line-height: 60px;
}
.feature-popup-container form .main-line label.monster-invalid {
top: 45px;
}
.feature-popup-container input,
.feature-popup-container select {
margin-left: 10px;
}
/* Caller-ID User Feature Popup */
.feature-popup-container[data-feature="caller_id"] {
width: 525px;
@ -805,6 +778,10 @@
border-top: 1px solid #CCCCCC;
}
.smart-edit-popup .actions .cancel-link {
margin-right: 10px;
}
/* Find me Follow me feature popup */
.feature-popup-container[data-feature="find_me_follow_me"] {
width: 620px;


+ 1
- 1
submodules/vmboxes/vmboxes.css View File

@ -182,7 +182,7 @@
}
.edit-vmbox .actions button {
margin-left: 5px;
margin-left: 10px;
}
.edit-vmbox .title-bar {


+ 1
- 1
views/callLogs-cdrsList.html View File

@ -47,7 +47,7 @@
</div>
<div class="grid-cell report">
<div class="sub-cell single-cell">
<a href="{{this.mailtoLink}}">{{../i18n.callLogs.reportCall}}</a>
<a class="monster-link" href="{{this.mailtoLink}}">{{../i18n.callLogs.reportCall}}</a>
</div>
</div>
</div>


+ 1
- 1
views/strategy-calls.html View File

@ -32,6 +32,6 @@
</div>
<div class="calls-actions basic-actions">
<a href="#" class="cancel-link">{{i18n.cancel}}</a>
<a href="#" class="monster-link blue cancel-link">{{i18n.cancel}}</a>
<button class="btn btn-success save-button">{{i18n.saveChanges}}</button>
</div>

+ 1
- 1
views/strategy-confnum.html View File

@ -13,7 +13,7 @@
</div>
{{/each}}
<div class="number-actions">
<a href="#" class="cancel-link pull-right">{{ i18n.close }}</a>
<a href="#" class="monster-link blue cancel-link pull-right">{{ i18n.close }}</a>
<div class="action-links nav-bar clearfix">
<a href="#" class="spare-link monster-link pull-left{{#unless spareLinkEnabled}} disabled{{/unless}}"><i class="icon-file-text-alt icon-orange icon-large"></i>{{ i18n.strategy.numberLinks.spare }}</a>
<ul class="nav pull-left">


+ 1
- 1
views/strategy-holidays.html View File

@ -27,6 +27,6 @@
</div>
<div class="holidays-actions basic-actions">
<a href="#" class="cancel-link">{{i18n.cancel}}</a>
<a href="#" class="cancel-link monster-link blue">{{i18n.cancel}}</a>
<button class="btn btn-success save-button">{{i18n.saveChanges}}</button>
</div>

+ 1
- 1
views/strategy-hours.html View File

@ -65,7 +65,7 @@
{{/monsterText}}
</div>
<div class="custom-hours-actions basic-actions">
<a href="#" class="cancel-link">{{i18n.cancel}}</a>
<a href="#" class="monster-link blue cancel-link">{{i18n.cancel}}</a>
<button class="btn btn-success save-button">{{i18n.saveChanges}}</button>
</div>
</form>

+ 2
- 2
views/strategy-menuPopup.html View File

@ -8,7 +8,7 @@
<div class="content">
</div>
<div class="add-menu-line">
<a href="#">{{i18n.strategy.popup.addRouteLink}}</a>
<a class="monster-link blue" href="#">{{i18n.strategy.popup.addRouteLink}}</a>
</div>
</div>
<div class="right">
@ -84,6 +84,6 @@
</div>
<div class="action-block clearfix">
<button class="save-button btn btn-success pull-right">{{i18n.save}}</button>
<a href="#" class="cancel-link pull-right">{{i18n.cancel}}</a>
<a href="#" class="monster-link blue cancel-link pull-right">{{i18n.cancel}}</a>
</div>
</div>

+ 1
- 1
views/strategy-numbers.html View File

@ -36,7 +36,7 @@
</div>
{{/each}}
<div class="number-actions">
<a href="#" class="cancel-link pull-right">{{ i18n.close }}</a>
<a href="#" class="cancel-link pull-right monster-link blue">{{ i18n.close }}</a>
<div class="action-links nav-bar clearfix">
<a href="#" class="spare-link monster-link pull-left{{#unless spareLinkEnabled}} disabled{{/unless}}"><i class="icon-file-text-alt icon-orange icon-large"></i>{{ i18n.strategy.numberLinks.spare }}</a>
<ul class="nav pull-left">


Loading…
Cancel
Save