---
src/app/stylesheets/layout.scss | 5 +++--
src/app/views/providers/edit.haml | 23 +++++++++++++++++++----
src/public/images/alert_icon_critical.png | Bin 337 -> 321 bytes
src/public/images/alert_icon_warn.png | Bin 364 -> 2993 bytes
src/public/javascripts/application.js | 7 +++++++
5 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index db9ad6c..c37a1d0 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -1627,16 +1627,17 @@ dl.alerts{
font-family: $font-family-primary;
font-size: 13px;
color: #333;
+ font-weight: bold;
}
dt.subject.warn{
- padding-left: $alert_padding*2 + 14px;
+ padding-left: $alert_padding*2 + 16px;
background: transparent url('../../images/alert_icon_warn.png') no-repeat
$alert_padding 8px;
}
dt.subject.critical{
padding-left: $alert_padding*2 + 16px;
- background: transparent url('../../images/alert_icon_critical.png')
no-repeat $alert_padding 7px;
+ background: transparent url('../../images/alert_icon_critical.png')
no-repeat $alert_padding 8px;
}
dd{
diff --git a/src/app/views/providers/edit.haml b/src/app/views/providers/edit.haml
index 8cac34d..cba1317 100644
--- a/src/app/views/providers/edit.haml
+++ b/src/app/views/providers/edit.haml
@@ -2,13 +2,28 @@
= render :partial => 'section_header'
- if @provider.enabled
- %section.admin-content-section.provider
+ %section.admin-content-section.alerts
%header
%h2.alerts
Alerts
- %span.label.badge.count.alert 2
- .content
- unimplemented
+ %span.label.badge.count.alert 3
+ .section-controls
+ = link_to "Toggle Alerts", "#", :class => 'collapse
alerts'
+ .content.collapsible
+ %dl.alerts
+ %ul
+ %li.alert
+ %dt.subject.critical Subject
+ %dd.type Alert type
+ %dd.desc Lorem Ipsum has been the industry's standard dummy text ever
since the 1500s, when an unknown printer [...]
+ %li.alert
+ %dt.subject.warn Subject
+ %dd.type Alert type
+ %dd.desc Lorem Ipsum has been the industry's standard dummy text ever
since the 1500s, when an unknown printer [...]
+ %li.alert
+ %dt.subject.critical Subject
+ %dd.type Alert type
+ %dd.desc Lorem Ipsum has been the industry's standard dummy text ever
since the 1500s, when an unknown printer [...]
%section.admin-content-section.provider
%header
%h2.activity
diff --git a/src/public/images/alert_icon_critical.png
b/src/public/images/alert_icon_critical.png
index aa412d130645d4e305dc179e6759502534c6815f..e451ad38c8ca383e98c65770f17dfb3e827b1b5d
100644
GIT binary patch
delta 197
zcmV;$06PEC0>J{1gnv0NF*YwTG5X*TA^-pYnn^@KR5*>L)5{IQFc5^{&k+UC2^SZT
zR1#XD1Ud+vqyQgCCv*TOkRzOjl{v2ck7rlwAXDOu5f^1WBG<eSD&V3?sD%Ganhp4l
zTcO@31_+7g%FA73OuUzpG!?N+>YD>FIBam*IByf}+J&$(pgvvNYN3nSvMm`r4g{FK
zn>e7ah0*4Jp~hrF8+pz8+iCKHDGX@CWCp_rawjL3%@jAu00000NkvXXu0mjf)>~4b
delta 213
zcmV;`04o2%0?`7Hgnu<JGB7VOF<*;cS^xk5s!2paR5*>Lld%!PFbqXsYzAP3OhE3u
zfSDvzS_4*~Rh4XzmW~Bnun8m3<(#`1#php2_nxFe9a%)=47`C0`<YesmKS^l3^0Tc
z`jpbL5gdefCEkFazzc{ai8CfIs`@DOMiH6Z!L>^nT>}h2vrgb-^rMKx7Qx-xz&hco
zs+}d6tto%<=>SAz0>)Yxh#nxNw1g0PV5osr^}9Y(g=B>x`^JNk4Gi!Ddm2DmUoW$f
P00000NkvXXu0mjfL04MC
diff --git a/src/public/images/alert_icon_warn.png
b/src/public/images/alert_icon_warn.png
index 0e64c05f4ff797c82a1d66d7a3c112a9fbb43dd9..eae92b71da18816e77e7d7906d438c381f70bc54
100644
GIT binary patch
literal 2993
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
delta 352
zcmdle{)Wl0Gr-TCmrII^fq{Y7)59eQNb`Z%9Be>x=AHO@AjMMb<Qc*N1T`Ef9TOGB
z>ltK9Tq8<?^V3So6N^$A98>a>QWe}Xi&D$;i?WLqoP$jZw>~xl>J$a3b1q6vEXmBz
zQwYh-O=U3EH!{#SG>q?#j{+(<>gnPbqA{^{(q7Rf2Z0v*nkP3HOCD@y+QMu-A;UxS
zppeHxPVWt@Zyl^Ja2X_2uG?X8^3L7*dvDJCRbiP>!f@^Y_l>W$^>ech8!&9>YH`S(
zv-6{PUCSgbg>vtusu5ydQP%D31+!HnN^*4M98!xLVuBu<s~K<KE&Q%m|Cs)Q7rWkB
zmgmgXaC#=x<K)R&@JD&pg)6183`@@C_GRcY`#DVYxb@Mp{dmdZ*$cM$u633;ZIN|r
snVQ2+1)lnzg+7w<R{ULoM>w~e`%cw1EbcLX4fGO&r>mdKI;Vst05Xt)hyVZp
diff --git a/src/public/javascripts/application.js
b/src/public/javascripts/application.js
index b74937c..fc3bb8c 100644
--- a/src/public/javascripts/application.js
+++ b/src/public/javascripts/application.js
@@ -173,6 +173,12 @@ $.extend(Conductor, {
});
},
+ toggleCollapsible: function() {
+ $('.collapse').click(function() {
+ $(this).parents('section').find('.collapsible').slideToggle(80);
+ });
+ },
+
prefixedPath: function(path) {
var prefix = this.PATH_PREFIX;
if(path.length === 0) return prefix;
@@ -325,6 +331,7 @@ $(document).ready(function () {
Conductor.bind_pretty_toggle();
Conductor.multiDestroyValidation();
Conductor.closeNotification();
+ Conductor.toggleCollapsible();
Conductor.enhanceUserMenu();
Conductor.tabAjaxRequest();
Conductor.initializeBackbone();
--
1.7.6