comanage-dev - [comanage-dev] r550 - in registry/trunk/app: View/Layouts webroot/css webroot/js/jquery/noty webroot/js/jquery/noty/themes webroot/js/jquery/ui/css/comanage-theme/images
Subject: COmanage Developers List
List archive
[comanage-dev] r550 - in registry/trunk/app: View/Layouts webroot/css webroot/js/jquery/noty webroot/js/jquery/noty/themes webroot/js/jquery/ui/css/comanage-theme/images
Chronological Thread
- From:
- To:
- Subject: [comanage-dev] r550 - in registry/trunk/app: View/Layouts webroot/css webroot/js/jquery/noty webroot/js/jquery/noty/themes webroot/js/jquery/ui/css/comanage-theme/images
- Date: Fri, 28 Jun 2013 03:22:52 -0400
- Authentication-results: sfpop-ironport03.merit.edu; dkim=neutral (message not signed) header.i=none
Author: marie
Date: 2013-06-28 03:22:49 -0400 (Fri, 28 Jun 2013)
New Revision: 550
Added:
registry/trunk/app/webroot/js/jquery/noty/LICENSE.txt
registry/trunk/app/webroot/js/jquery/noty/themes/comanage.js
registry/trunk/app/webroot/js/jquery/ui/css/comanage-theme/images/ui-icons_006400_256x240.png
registry/trunk/app/webroot/js/jquery/ui/css/comanage-theme/images/ui-icons_444444_256x240.png
registry/trunk/app/webroot/js/jquery/ui/css/comanage-theme/images/ui-icons_826262_256x240.png
Modified:
registry/trunk/app/View/Layouts/default.ctp
registry/trunk/app/webroot/css/comanage.css
Log:
co609 Noty library for flash messages
Modified: registry/trunk/app/View/Layouts/default.ctp
===================================================================
--- registry/trunk/app/View/Layouts/default.ctp 2013-06-27 22:32:38 UTC (rev
549)
+++ registry/trunk/app/View/Layouts/default.ctp 2013-06-28 07:22:49 UTC (rev
550)
@@ -44,8 +44,23 @@
<?php print
$this->Html->script('jquery/ui/js/jquery-ui-1.10.0.custom.min.js'); ?>
<?php print $this->Html->script('jquery/superfish/js/superfish.js'); ?>
+ <?php print $this->Html->script('jquery/noty/jquery.noty.js'); ?>
+ <?php print $this->Html->script('jquery/noty/layouts/top.js'); ?>
+ <?php print $this->Html->script('jquery/noty/themes/comanage.js'); ?>
+
<!-- Common script code -->
<script type="text/javascript">
+
+ function generateFlash(text, type) {
+ var n = noty({
+ text: text,
+ type: type,
+ dismissQueue: true,
+ layout: 'top',
+ theme: 'comanage'
+ });
+ }
+
// Function to confirm delete and then hand off
function js_confirm_delete(name, url)
@@ -335,6 +350,35 @@
$(function() {
$( "#menu" ).menu();
});
+
+ $(function() {
+ <?php // Flash Messages
+ $f = $this->Session->flash('error');
+
+ if($f && $f != "") {
+ print 'generateFlash( \''. $f . '\',"error");';
+ }
+
+ $f = $this->Session->flash('info');
+
+ if($f && $f != "") {
+ print 'generateFlash( \''. $f . '\',"info");';
+ }
+
+ $f = $this->Session->flash('success');
+
+ if($f && $f != "") {
+ print 'generateFlash( \''. $f . '\',"success");';
+ }
+
+ $f = $this->Session->error();
+
+ if($f && $f != "") {
+ print 'generateFlash( \''. $f . '\',"error");';
+ }
+ ?>
+ });
+
</script>
<!-- Include external files and scripts -->
@@ -375,55 +419,6 @@
</div>
</div>
- <div id="flashMessages" class="contentWidth">
- <?php
- $f = $this->Session->flash('error');
-
- if($f && $f != "") {
- print '
- <div class="ui-widget">
- <div class="ui-state-error ui-corner-all" style="margin-top:
20px; padding: 0 .7em;">
- <p>
- <span class="ui-icon ui-icon-alert" style="float: left;
margin-right: .3em;"></span>
- ' . $f . '
- </p>
- </div>
- </div>
- ';
- }
-
- $f = $this->Session->flash('info');
-
- if($f && $f != "") {
- print '
- <div class="ui-widget">
- <div class="ui-state-highlight ui-corner-all"
style="margin-top: 20px; padding: 0 .7em;">
- <p><span class="ui-icon ui-icon-info" style="float: left;
margin-right: .3em;"></span>
- ' . $f . '
- </p>
- </div>
- </div>
- ';
- }
-
- $f = $this->Session->flash('success');
-
- if($f && $f != "") {
- print '
- <div class="ui-widget">
- <div class="ui-state-active ui-corner-all" style="margin-top:
20px; padding: 0 .7em;">
- <p><span class="ui-icon ui-icon-circle-check" style="float:
left; margin-right: .3em;"></span>
- ' . $f . '
- </p>
- </div>
- </div>
- ';
- }
- ?>
-
- <?php print_r($this->Session->error()); ?>
- </div>
-
<div id="main" class="contentWidth">
<div id="content">
<!-- Display view content -->
Modified: registry/trunk/app/webroot/css/comanage.css
===================================================================
--- registry/trunk/app/webroot/css/comanage.css 2013-06-27 22:32:38 UTC (rev
549)
+++ registry/trunk/app/webroot/css/comanage.css 2013-06-28 07:22:49 UTC (rev
550)
@@ -297,3 +297,28 @@
background-image:
url(../js/jquery/ui/css/comanage-theme/images/ui-icons_6eac2c_256x240.png)
!important;
}
+ .noty_text{
+ font-weight: bold;
+ }
+
+ .noty_icon{
+ display: inline-block !important;
+ position: relative;
+ top: 3px;
+ }
+
+ .warbg{
+ background-image:
url(../js/jquery/ui/css/comanage-theme/images/ui-icons_826262_256x240.png)
!important;
+ }
+
+ .sucbg{
+ background-image:
url(../js/jquery/ui/css/comanage-theme/images/ui-icons_006400_256x240.png)
!important;
+ }
+
+ .errbg{
+ background-image:
url(../js/jquery/ui/css/comanage-theme/images/ui-icons_ffffff_256x240.png)
!important;
+ }
+
+ .notbg{
+ background-image:
url(../js/jquery/ui/css/comanage-theme/images/ui-icons_444444_256x240.png)
!important;
+ }
\ No newline at end of file
Property changes on:
registry/trunk/app/webroot/js/jquery/ui/css/comanage-theme/images/ui-icons_006400_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on:
registry/trunk/app/webroot/js/jquery/ui/css/comanage-theme/images/ui-icons_444444_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on:
registry/trunk/app/webroot/js/jquery/ui/css/comanage-theme/images/ui-icons_826262_256x240.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
- [comanage-dev] r550 - in registry/trunk/app: View/Layouts webroot/css webroot/js/jquery/noty webroot/js/jquery/noty/themes webroot/js/jquery/ui/css/comanage-theme/images, svnlog, 06/28/2013
Archive powered by MHonArc 2.6.16.