pramilaniroshan
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #356 from DimalChandrasiri/theme-migration

Browse Source 
Model Fixes
revert-70aa11f8
Dilan U. Ariyaratne 8 years ago committed by GitHub
parent 5b0e99aeff 1599b84e54
commit df7c54b1af
8 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File

14
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
Unescape View File

@ -15,7 +15,6 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
}} }}
{{unit "cdmf.unit.ui.title" pageTitle="Add Certificate"}} {{unit "cdmf.unit.ui.title" pageTitle="Add Certificate"}}
{{#zone "breadcrumbs"}} {{#zone "breadcrumbs"}}
@ -25,9 +24,8 @@
</a> </a>
</li> </li>
<li> <li>
<!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/certificates"> <a href="{{@app.context}}/certificates">
Certificates Certificate
</a> </a>
</li> </li>
{{/zone}} {{/zone}}
@ -35,7 +33,6 @@
{{#zone "navbarActions"}} {{#zone "navbarActions"}}
{{#if removePermitted}} {{#if removePermitted}}
<li> <li>
<!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/certificates/add"> <a href="{{@app.context}}/certificates/add">
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
@ -100,7 +97,10 @@
</tr> </tr>
</thead> </thead>
<tbody id="ast-container"></tbody> <tbody id="ast-container">
<br class="c-both"/>
</tbody>
</table> </table>
</div> </div>
<br class="c-both"/> <br class="c-both"/>
@ -121,7 +121,7 @@
<a href="#" id="remove-certificate-yes-link" class="btn-operations"> <a href="#" id="remove-certificate-yes-link" class="btn-operations">
Remove Remove
</a> </a>
<a href="#" id="remove-certificate-cancel-link" class="btn-operations"> <a href="#" id="remove-certificate-cancel-link" class="btn-operations btn-default">
Cancel Cancel
</a> </a>
</div> </div>
@ -180,9 +180,9 @@
{{/zone}} {{/zone}}
{{#zone "bottomJs"}} {{#zone "bottomJs"}}
<!--suppress HtmlUnknownTarget -->
<script id="certificate-listing" data-current-user="{{@user.username}}" <script id="certificate-listing" data-current-user="{{@user.username}}"
src="{{@page.publicUri}}/templates/certificate-listing.hbs" src="{{@page.publicUri}}/templates/certificate-listing.hbs"
type="text/x-handlebars-template"></script> type="text/x-handlebars-template"></script>
{{js "/js/certificate-listing.js"}} {{js "/js/certificate-listing.js"}}
{{/zone}} {{/zone}}

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
Unescape View File

@ -199,7 +199,7 @@
&nbsp;&nbsp;&nbsp;&nbsp;Assign&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;Assign&nbsp;&nbsp;&nbsp;&nbsp;
</a> </a>
&nbsp;&nbsp; &nbsp;&nbsp;
<a href="#" id="group-device-cancel-link" class="btn-operations"> <a href="#" id="group-device-cancel-link" class="btn-operations btn-default">
&nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
</a> </a>
</div> </div>

8
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
Unescape View File

@ -109,7 +109,7 @@
&nbsp;&nbsp;&nbsp;&nbsp;Next&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;Next&nbsp;&nbsp;&nbsp;&nbsp;
</a> </a>
&nbsp;&nbsp; &nbsp;&nbsp;
<a href="#" id="share-group-w1-cancel-link" class="btn-operations"> <a href="#" id="share-group-w1-cancel-link" class="btn-operations btn-default">
&nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
</a> </a>
</div> </div>
@ -130,7 +130,7 @@
&nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
</a> </a>
&nbsp;&nbsp; &nbsp;&nbsp;
<a href="#" id="share-group-w2-cancel-link" class="btn-operations"> <a href="#" id="share-group-w2-cancel-link" class="btn-operations btn-default">
&nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
</a> </a>
</div> </div>
@ -160,7 +160,7 @@
&nbsp;&nbsp;&nbsp;&nbsp;Yes&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;Yes&nbsp;&nbsp;&nbsp;&nbsp;
</a> </a>
&nbsp;&nbsp; &nbsp;&nbsp;
<a href="#" id="remove-group-cancel-link" class="btn-operations"> <a href="#" id="remove-group-cancel-link" class="btn-operations btn-default">
&nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
</a> </a>
</div> </div>
@ -203,7 +203,7 @@
&nbsp;&nbsp;&nbsp;&nbsp;Update&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;Update&nbsp;&nbsp;&nbsp;&nbsp;
</a> </a>
&nbsp;&nbsp; &nbsp;&nbsp;
<a href="#" id="edit-group-cancel-link" class="btn-operations"> <a href="#" id="edit-group-cancel-link" class="btn-operations btn-default">
&nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
</a> </a>
</div> </div>

8
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs
Unescape View File

@ -268,7 +268,7 @@
Remove Remove
</a> </a>
<a href="#" id="remove-policy-cancel-link" class="btn-operations"> <a href="#" id="remove-policy-cancel-link" class="btn-operations btn-default">
Cancel Cancel
</a> </a>
</div> </div>
@ -337,7 +337,7 @@
<div class="modal-footer"> <div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="publish-policy-yes-link" class="btn-operations">Yes</a> <a href="#" id="publish-policy-yes-link" class="btn-operations">Yes</a>
<a href="#" id="publish-policy-cancel-link" class="btn-operations">No</a> <a href="#" id="publish-policy-cancel-link" class="btn-operations btn-default">No</a>
</div> </div>
</div> </div>
</div> </div>
@ -390,7 +390,7 @@
Yes Yes
</a> </a>
<a href="#" id="unpublish-policy-cancel-link" class="btn-operations"> <a href="#" id="unpublish-policy-cancel-link" class="btn-operations btn-default">
No No
</a> </a>
</div> </div>
@ -479,7 +479,7 @@
Yes Yes
</a> </a>
<a href="#" id="change-policy-cancel-link" class="btn-operations"> <a href="#" id="change-policy-cancel-link" class="btn-operations btn-default">
No No
</a> </a>
</div> </div>

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
Unescape View File

@ -114,7 +114,7 @@ function loadRoles() {
class: "remove-padding icon-only content-fill", class: "remove-padding icon-only content-fill",
data: null, data: null,
defaultContent: "<div class='thumbnail icon'>" + defaultContent: "<div class='thumbnail icon'>" +
"<i class='square-element text fw fw-bookmark' style='font-size: 30px;'></i>" + "<i class='square-element text fw fw-bookmark' style='font-size: 74px;'></i>" +
"</div>" "</div>"
}, },
{ {

44
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
Unescape View File

@ -101,30 +101,32 @@ under the License.
<div id="remove-role-modal-content" class="hide"> <div id="remove-role-modal-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">Do you really want to remove this role ?</h3>
<div class="col-lg-5 col-md-6 col-centered"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
<h3>Do you really want to remove this role ?</h3> </div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="remove-role-yes-link" class="btn-operations"> <a href="#" id="remove-role-yes-link" class="btn-operations">
Remove Remove
</a> </a>
<a href="#" id="remove-role-cancel-link" class="btn-operations"> <a href="#" id="remove-role-cancel-link" class="btn-operations btn-default">
Cancel Cancel
</a> </a>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="remove-role-success-content" class="hide"> <div id="remove-role-success-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">Done. Role was successfully removed.</h3>
<div class="col-lg-5 col-md-6 col-centered"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
<h3>Done. Role was successfully removed.</h3> </div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="remove-role-success-link" class="btn-operations"> <a href="#" id="remove-role-success-link" class="btn-operations">
Ok Ok
@ -132,15 +134,15 @@ under the License.
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="remove-role-error-content" class="hide"> <div id="remove-role-error-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">An unexpected error occurred. Please try again later.</h3>
<div class="col-lg-5 col-md-6 col-centered"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
<h3>An unexpected error occurred. Please try again later.</h3> </div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="remove-role-error-link" class="btn-operations"> <a href="#" id="remove-role-error-link" class="btn-operations">
Ok Ok
@ -148,8 +150,6 @@ under the License.
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
{{/zone}} {{/zone}}
{{#zone "bottomJs"}} {{#zone "bottomJs"}}

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
Unescape View File

@ -273,7 +273,7 @@ function loadUsers() {
class: "remove-padding icon-only content-fill", class: "remove-padding icon-only content-fill",
data: null, data: null,
defaultContent: '<div class="thumbnail icon">' + defaultContent: '<div class="thumbnail icon">' +
'<i class="square-element text fw fw-user" style="font-size: 30px;"></i>' + '<i class="square-element text fw fw-user" style="font-size: 74px;"></i>' +
'</div>' '</div>'
}, },
{ {

6
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
Unescape View File

@ -113,7 +113,7 @@
<div class="modal-footer"> <div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="invite-user-yes-link" class="btn-operations">yes</a> <a href="#" id="invite-user-yes-link" class="btn-operations">yes</a>
<a href="#" id="invite-user-cancel-link" class="btn-operations">No</a> <a href="#" id="invite-user-cancel-link" class="btn-operations btn-default">No</a>
</div> </div>
</div> </div>
</div> </div>
@ -174,7 +174,7 @@
<div class="modal-footer"> <div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="remove-user-yes-link" class="btn-operations">Remove</a> <a href="#" id="remove-user-yes-link" class="btn-operations">Remove</a>
<a href="#" id="remove-user-cancel-link" class="btn-operations">Cancel</a> <a href="#" id="remove-user-cancel-link" class="btn-operations btn-default">Cancel</a>
</div> </div>
</div> </div>
</div> </div>
@ -297,7 +297,7 @@
Save Save
</a> </a>
<a href="#" id="reset-password-cancel-link" class="btn-operations"> <a href="#" id="reset-password-cancel-link" class="btn-operations btn-default">
Cancel Cancel
</a> </a>
</div> </div>

Write Preview
Loading…
Cancel
Save