Skip to content

Commit e5ac79d

Browse files
author
[email protected]
committed
Adding proper error message box and removing hard coded values.
git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@197602 a5903396-d722-0410-b921-86c7d4935375
1 parent 2578666 commit e5ac79d

File tree

9 files changed

+81
-105
lines changed

9 files changed

+81
-105
lines changed

‎components/cloud/cloudmgt/src/site/themes/default/assets/css/main.css

+16-1
Original file line numberDiff line numberDiff line change
@@ -609,4 +609,19 @@ ul.icons-ul { margin: 0; text-indent: 0; }
609609
.page_message .message_body { padding: 0 0 20px 0; }
610610
.page_message .message_action { padding: 20px 20px 20px 0; }
611611
.page_message .icon-circle { font-size: 60px; line-height: 60px; }
612-
.page_message .icon-exclamation { font-size: 40px; line-height: 60px; }
612+
.page_message .icon-exclamation { font-size: 40px; line-height: 60px; }
613+
614+
/* Message styles
615+
================== */
616+
.sticky-wrapper { position: absolute; width: 100%; }
617+
.message_box { font-weight: 700; width: 100%; z-index: 11111;position: absolute }
618+
.error_message { background: url(../img/error_bg.png) repeat left top; border-bottom: 1px solid #EB7067; color: #FFF; }
619+
.info_message { background: url(../img/info_bg.png) repeat left top; border-bottom: 1px solid #FFE; color: #999; }
620+
.warning_message { background: url(../img/warning_bg.png) repeat left top; border-bottom: 1px solid #F47A20; color: #FFF; }
621+
.success_message { background: url(../img/success_bg.png) repeat left top; border-bottom: 1px solid #6EA66C; color: #FFF; }
622+
.message .content { padding: 10px 40px; overflow: auto; }
623+
.message .content ul { margin-left: 0; margin-right: 0; padding: 0; list-style: none; }
624+
.close_message { margin-top: 13px; width: 14px; text-decoration: none; color: #FFF; font-size: 1.14285714em; cursor: pointer; }
625+
.close_message:hover { color: #000; }
626+
.info_message .close_message { color: #FFCC66; }
627+
.info_message .close_message:hover { color: #000; }

‎components/cloud/cloudmgt/src/site/themes/default/js/jagg.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ var messageTimer;
126126

127127
if($appendTo == undefined){
128128
if(typeof message_html == 'object'){
129-
var $message = $('<div class="message '+message_type+'_message" style="display:none"><div class="content"><div class="left message-container"></div><a class="close_message right icon-remove-sign js_close_message"></a></div></div>');
129+
var $message = $('<div class="container"><div class="row"><div class="col-lg-12"><div class="message '+message_type+'_message" style="display:none"><div class="content"><div class="left message-container"></div><a class="close_message right icon-remove-sign js_close_message"><i class="fa fa-times-circle"></i></a></div></div></div></div></div>');
130130
$('.message-container',$message).append(message_html);
131131
$(".message_box").append($message);
132132
}else{
133-
var $message = $('<div class="message '+message_type+'_message" style="display:none"><div class="content"><div class="left message-container">'+message_html+'</div><a class="close_message right icon-remove-sign js_close_message"></a></div></div>');
133+
var $message = $('<div class="container"><div class="row"><div class="col-lg-12"><div class="message '+message_type+'_message" style="display:none"><div class="content"><div class="left message-container">'+message_html+'</div><a class="close_message right icon-remove-sign js_close_message"><i class="fa fa-times-circle"></i></a></div></div></div></div></div>');
134134
$(".message_box").append($message);
135135
}
136136
var $messageObj = $(".message_box .message:last-child");
@@ -174,8 +174,8 @@ var messageTimer;
174174
if(params.type == "confirm"){
175175
//show ok and cancel buttons and register callbacks for each.
176176
$buttonRow = $('<ul class="inline_list">'+
177-
'<li class="inline_item"><a href="#" class="btn sub big modal_cancel" >Cancel</a></li>'+
178177
'<li class="inline_item"><a href="#" class="btn main big modal_action">Ok</a></li>'+
178+
'<li class="inline_item"><a href="#" class="btn sub big modal_cancel" >Cancel</a></li>'+
179179
'</ul>');
180180

181181
$('.modal_action',$buttonRow).click(function(){
@@ -192,7 +192,7 @@ var messageTimer;
192192
}
193193
}
194194

195-
if(params.type == "ok"){
195+
if(params.type == "ok" || params.type == "error"){
196196
//show ok and cancel buttons and register callbacks for each.
197197
$buttonRow = $('<ul class="inline_list">'+
198198
'<li class="inline_item"><a href="#" class="btn main big modal_action">Ok</a></li>'+
@@ -209,7 +209,6 @@ var messageTimer;
209209
$('.img',$modelObject ).remove();
210210
}
211211

212-
213212
if( (typeof $buttonRow) == "object"){
214213
$('#buttonRowContainer',$modelObject).append($buttonRow);
215214
}else{
@@ -274,4 +273,4 @@ var messageTimer;
274273
}
275274
});
276275

277-
}());
276+
}());

‎components/cloud/cloudmgt/src/site/themes/default/new-assets/css/main.css

+10-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@
2020
color:#898989;
2121
font-size: 18px;
2222
}
23+
.helper_text {
24+
color: #1190A5;
25+
text-align: center;
26+
font-size:15px;
27+
}
28+
29+
.helper_text .helper_text_bold {
30+
font-weight: bold;
31+
}
2332
.main-menu li.active i{
2433
color: #2877aa;
2534
}
@@ -362,4 +371,4 @@ span.checkbox-half {
362371
}
363372
.icon-stack i{
364373
font-size:16px;
365-
}
374+
}

‎components/cloud/cloudmgt/src/site/themes/default/templates/register/template.jag

+5-70
Original file line numberDiff line numberDiff line change
@@ -22,75 +22,7 @@ var eulaContent = eulaDoc.EULA.text();
2222
eulaFile.close();
2323
%>
2424

25-
<style>
26-
header{
27-
display:none;
28-
}
29-
body#home{
30-
background:none #292E38;
31-
}
32-
.sticky-wrapper{
33-
position:relative;
34-
height:auto !important;
35-
}
36-
37-
.warning_message{
38-
background-color:#ffffff;
39-
}
40-
.info_message .close_message {
41-
position: absolute;
42-
right: 13px;
43-
top: 7px;
44-
}
45-
.info_message{
46-
background-color:#ffffff;
47-
width: 400px;
48-
}
49-
50-
.txt-right{
51-
text-align: right;
52-
}
53-
#tenantDomain{
54-
width: 87%;
55-
margin-left: 7px;
56-
}
57-
58-
59-
#captchaImgDiv img{
60-
width:100%;
61-
height: 39px;
62-
}
63-
#aPaaS, #iPaaS{
64-
width:20%;
65-
}
66-
#lblLoginID{
67-
color:#888;
68-
display:none;
69-
}
70-
71-
#preAt{
72-
margin-left: -3px;
73-
margin-right: -3px;
74-
}
75-
76-
section.start_content div.subs-cont{
77-
margin-top:20px;
78-
margin-bottom:30px;
79-
}
80-
.subs-cont span.error{
81-
position: absolute;
82-
margin-top: 71px;
83-
margin-left: -14px;
84-
}
85-
span.error {
86-
padding-left: 0;
87-
}
88-
#submitbtn {
89-
background-color: #F9BFBB;
90-
border: #F9BFBB;
91-
}
9225

93-
</style>
9426

9527
<script type="text/javascript">
9628

@@ -158,20 +90,23 @@ span.error {
15890
window.location.href = cloudmgtURL;
15991
}
16092
});
93+
$('#registerForm').hide();
16194
});
16295
},
16396
function (jqXHR, textStatus, errorThrown) {
16497
jagg.message({content:'Error while storing subscription details.',type:'error',cbk:function(){
16598
window.location.href = cloudmgtURL;
16699
}
167100
});
101+
$('#registerForm').hide();
168102
});
169103
},
170104
function (jqXHR, textStatus, errorThrown) {
171105
jagg.message({content:jqXHR.responseText, type:'error',cbk:function(){
172106
window.location.href = "register.jag";
173107
}
174108
});
109+
$('#registerForm').hide();
175110
});
176111
}
177112
}
@@ -320,10 +255,10 @@ function showKaptcha(captcha) {
320255
</div>
321256
</div>
322257
</div>
258+
<% jagg.includeBlock("page/messages", null); %>
323259
<div class="container content-section-wrapper">
324260
<div class="row">
325261
<div class="col-lg-12 content-section">
326-
<div class="alert alert-error error" id="registerError"><% jagg.includeBlock("page/messages", null); %></div>
327262
<form method='post' name="inputData" class='form-horizontal' id='registerForm' role="form" >
328263
<!--first name-->
329264
<div class="form-group">
@@ -441,7 +376,7 @@ function showKaptcha(captcha) {
441376
<div class="form-group">
442377
<div class="col-sm-offset-2 col-sm-8">
443378
<input id="submitbtn" type='submit' disabled="disabled" value='Create My Account' class="btn btn-primary"/>
444-
Already have an Account? <a href="<%='https://cloudmgt.cloudpreview.wso2.com/cloudmgt/'%>" class="link">Sign in</a>
379+
Already have an Account? <a href="<%=cloudmgtURL%>" class="link">Sign in</a>
445380
</div>
446381
</div>
447382

‎components/cloud/cloudmgt/src/site/themes/default/templates/subscriptions/template.jag

+10-9
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ file.close();
3030
<div class="container content-starter">
3131
<div class="row">
3232
<div class="col-lg-12">
33-
<h1>Subscription</h1>
34-
<p>Click the logo of the cloud you want to access.</p>
33+
<h1>Home</h1>
34+
3535
</div>
3636
</div>
3737
</div>
@@ -53,20 +53,21 @@ file.close();
5353
<% }else{ %>
5454
<div class="col-lg-4">
5555
<i class="<%=types[i].toString()%>_disabled"></i>
56+
<center> <font size="3" color="#1190A5" text-align="center"> Coming Soon..</font></center>
5657
</div>
58+
5759
<% }
5860
} %>
5961
<input type="hidden" name="secretKey" id="secretKey" value=""/>
6062
<input type="hidden" name="imagePath" id="imagePath" value=""/>
61-
<div class="helper_text">
62-
<p class="helper_text_bold">You are now signed in.</p>
6363

64-
</div>
65-
</div>
66-
</div>
64+
</div> <br/>
65+
66+
</div> <div class="helper_text">
67+
<br/><p class="helper_text_bold">You are now signed in.</p>
68+
<p>Click the logo of the cloud you want to access.</p>
69+
</div>
6770
</div>
68-
69-
7071
<% }
7172
%>
7273
<% }); %>

‎components/cloud/cloudmgt/src/site/themes/default/templates/toplinks/template.jag

+30-5
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,43 @@ jagg.template("toplinks", function(inputs, outputs, jagg) { %>
2222
<div class="navbar-collapse collapse main-menu-inside">
2323

2424
<ul class="nav navbar-nav pull-left menu1">
25-
<li class="active"><a href="<%=jagg.getAbsoluteUrl("/site/pages/index.jag")%>"><i class="fa fa-home"></i> <span><br>Home</span></a></li>
26-
<li class="active"><a href="<%=jagg.getAbsoluteUrl("/site/pages/change-password.jag")%>"><i class="fa fa-lock"></i> <span><br>Change Password</span></a></li>
27-
<li class="active"><a href="<%=jagg.getAbsoluteUrl("/site/pages/user.jag")%>"><i class="fa fa-users"></i> <span><br>Users</span></a></li>
25+
<li><a href="<%=jagg.getAbsoluteUrl("/site/pages/index.jag")%>"><i class="fa fa-home"></i> <span><br>Home</span></a></li>
26+
<li><a href="<%=jagg.getAbsoluteUrl("/site/pages/change-password.jag")%>"><i class="fa fa-lock"></i> <span><br>Change Password</span></a></li>
27+
<li><a href="<%=jagg.getAbsoluteUrl("/site/pages/user.jag")%>"><i class="fa fa-users"></i> <span><br>Users</span></a></li>
2828

2929
</ul>
3030
<ul class="nav navbar-nav pull-right menu2">
3131
<li class="name-column"><% if(userName !=null ) { %> <%=userName%> <% } %></li>
32-
<li class="active"><a href="<%=jagg.getAbsoluteUrl("/site/pages/logout.jag")%>"><i class="fa fa-sign-out"></i> <span><br>Logout</span></a></li>
32+
<li><a href="<%=jagg.getAbsoluteUrl("/site/pages/logout.jag")%>"><i class="fa fa-sign-out"></i> <span><br>Logout</span></a></li>
3333
</ul>
3434
</div>
3535
<!--/.navbar-collapse -->
3636
</div>
3737
</div>
3838

39-
<% } }); %>
39+
<% }
40+
else {%>
41+
<div class="navbar navbar-inverse navbar-fixed-top main-menu">
42+
<div class="container">
43+
<div class="navbar-header">
44+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
45+
<span class="icon-bar"></span>
46+
<span class="icon-bar"></span>
47+
<span class="icon-bar"></span>
48+
</button>
49+
<a class="navbar-brand" href="<%=jagg.getAbsoluteUrl("/site/pages/index.jag")%>"><img src="<%=jagg.getAbsoluteUrl(jagg.getThemeFile('new-assets/img/logo.png'))%>"/>
50+
</a>
51+
</div>
52+
<div class="navbar-collapse collapse main-menu-inside">
53+
54+
<ul class="nav navbar-nav pull-left menu1">
55+
56+
</ul>
57+
</div>
58+
<!--/.navbar-collapse -->
59+
</div>
60+
</div>
61+
62+
<%}
63+
64+
}); %>

‎components/cloud/cloudmgt/src/site/themes/default/templates/user/change/template.jag

+3-11
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,10 @@ section.start_content div.subs-cont{
8282
password:password
8383
},
8484
function (result) {
85-
$('#successBox').show();
86-
$('#errorBox').hide();
85+
jagg.message({type:'success',content:'You have successfully change the password.'});
8786
},
8887
function (jqXHR, textStatus, errorThrown) {
89-
$('#errorBox').show();
90-
$('#successBox').hide();
88+
jagg.message({type:'error',content:'<strong>Error!</strong> Old credential does not match with the existing credentials.'});
9189
})
9290
}
9391

@@ -134,16 +132,10 @@ section.start_content div.subs-cont{
134132
</div>
135133
</div>
136134
</div>
135+
<% jagg.includeBlock("page/messages", null); %>
137136
<div class="container content-section-wrapper">
138137
<div class="row">
139138
<div class="col-lg-12 content-section">
140-
<div class="alert alert-danger alert-dismissable" style="display:none" id="errorBox">
141-
<strong>Error!</strong> Old credential does not match with the existing credentials.
142-
</div>
143-
144-
<div class="alert alert-success alert-dismissable" style="display:none" id="successBox">
145-
You have successfully change the password.
146-
</div>
147139
<form method='post' name="inputData" class='form-horizontal' id='userForm' action="javascript:doSubmit()" role="form">
148140
<div class="form-group">
149141
<label for="inputEmail3" class="col-sm-2 control-label">Current Password</label>

‎components/cloud/cloudmgt/src/site/themes/default/templates/user/import/template.jag

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<span for="password2" generated="true" class="error" style="display:none;" id="pwdError">Password does not match</span>
135135
</div>
136136
<div class="buttonrow">
137-
<button class="btn btn-primary" id="btnImport">Import</button><a id="btn_cancel" href="javascript:location.href='/appmgt/site/pages/user.jag'">Cancel</a>
137+
<button class="btn btn-primary" id="btnImport">Import</button><a id="btn_cancel" href="javascript:location.href='/cloudmgt/site/pages/user.jag'">Cancel</a>
138138
</div>
139139
</fieldset>
140140
</form>

‎components/cloud/cloudmgt/src/site/themes/default/templates/user/list/template.jag

+1-1
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ $('#removeUsers').click(function(){
621621
<header class="separator">
622622
<div class="content">
623623
<div class="left">
624-
<a id="btnAddMembers" href="<%=jagg.getAbsoluteUrl("/site/pages/user-import.jag")%>" class="btn main head">Import Members</a>
624+
<a id="btnAddMembers" href="<%=jagg.getAbsoluteUrl("/site/pages/user-import.jag")%>" class='btn btn-primary'>Import Members</a>
625625
</div>
626626
<ul class="screen_option right">
627627
<li class="screen_option_item">

0 commit comments

Comments
 (0)