]> jfr.im git - z_archive/KronOS.git/commitdiff
Changes to application.js
authorConny Sjöblom <redacted>
Wed, 17 Oct 2012 14:05:56 +0000 (17:05 +0300)
committerConny Sjöblom <redacted>
Wed, 17 Oct 2012 14:05:56 +0000 (17:05 +0300)
application/libraries/Core.php
application/models/user.php
application/views/main_view.php
public/js/application.js

index 86879efdcddd1497b906b5032d2d63a904a83b40..b8570d30b04bd3f2fc24831fd1aedcb9545c6620 100644 (file)
@@ -5,7 +5,7 @@ class Core {
                $menu = array(
                        'Desktop'       => '#',
                        'App'           => '#',
-                       'Logout'        => 'javascript:logout();void(0);',
+                       'Logout'        => 'javascript:wos.logout();void(0);',
                        'GitHub'        => 'https://github.com/mustis/WebOsProject'
                );
                return $menu;
@@ -16,13 +16,9 @@ class Core {
                        <div class="modal-header">
                                <h3 id="myModalLabel">Login</h3>
                        </div>
-                       <form class="form-horizontal" method="post" action="javascript:submitLogin();void(0);">
+                       <form class="form-horizontal" method="post" action="javascript:wos.submitLogin();void(0);">
                                <div class="modal-body">
                                        <div class="messagebody">
-                                               <div class="alert alert-block alert-info">
-                                                       <button type="button" class="close" data-dismiss="alert">&times;</button>
-                                                       <strong>Notice!</strong> site is still being developed.
-                                               </div>
                                        </div>
                                        <div class="control-group">
                                                <label class="control-label" for="inputUsername">Username</label>
index 6c9a3cadbb2e1d68aca565e7d8844250e026cddc..187223e2f2c17755fdd2941207c87e7a411924a6 100644 (file)
@@ -113,9 +113,4 @@ class User extends CI_Model {
        public function is_logged_in() {
                return $this->sid() > 0;
        }
-
-       public function check_login() {
-               if (!$this->logged_in)
-                       redirect('account/login/');
-       }
 }
index 29d2ba53e7c1e6336ed7c044de3f5b15e35f860d..7ab72ca760d7562646164ef37fb392260dedb8d1 100644 (file)
                <![endif]-->\r
        </head>\r
        <body>\r
-               <div class="navbar navbar-inverse navbar-fixed-top">\r
-                       <div class="navbar-inner">\r
-                               <div class="container-fluid">\r
-                                       <a class="brand" href="#">WebOS Dev</a>\r
-                                       <div class="nav-collapse collapse menudiv">\r
-                                               <div class="menuitems">\r
-                                               </div>\r
-                                               <p class="navbar-text pull-right">\r
-                                                       Logged in as <a href="#" class="navbar-link" id="username"><em>unauthenticated</em></a>\r
-                                               </p>\r
-                                       </div>\r
-                               </div>\r
-                       </div>\r
-               </div>\r
-               <div id="desktop" class="container-fluid">\r
-                       <div class="row">\r
-                       </div>\r
-               </div>\r
                <script src="/public/js/jquery.min.js" type="text/javascript"></script>\r
                <script src="/public/js/bootstrap.min.js" type="text/javascript"></script>\r
                <script src="/public/js/application.js" type="text/javascript"></script>\r
index b150ac49107e378df4899d315f05bdebac39b832..0514799d079b60043aaeac73f5f1b4bd6dbced5d 100644 (file)
 var state
+var wos
 
-function loadDefaults() {
-       jQuery.getJSON("/backend/logged_in", function(resp) {
-               if (!resp.contents) {
-                       hideMenu();
-                       hideBackground();
-                       loadLoginModal();
-               } else {
-                       loadUsername();
-                       loadMenu();
-                       loadBackground();
+(function( $ ) {
+       $.fn.pageConstruct = function( initvar ) {
+
+               this.buildPage = function() {
+                       state = {}
+                       this.loadMenu();
+                       this.loadContainer();
                }
-       });
-}
-
-function loadBackground() {
-       background = '<style>body { background-image:url(\'/public/img/default-background.jpg\'); background-position: center top; } </style>'
-       jQuery('body').append(background);
-}
-
-function hideBackground() {
-       jQuery('style').remove();
-}
-
-function loadLoginModal() {
-       jQuery.ajax({
-               url: "/backend/login_modal",
-               success: function (data) {
-                       jQuery('body').append(data);
-                       jQuery('#loginModal').modal({
-                               backdrop: 'static',
-                               keyboard: false,
+
+               this.loadDefaults = function() {
+                       $.getJSON("/backend/logged_in", function(resp) {
+                               if (!resp.contents) {
+                                       wos.hideMenu();
+                                       wos.hideBackground();
+                                       wos.loadLogin();
+                               } else {
+                                       wos.loadUsername();
+                                       wos.loadBackground();
+                               }
                        });
-                       jQuery('#loginModal').modal('show');
-               },
-               dataType: 'html'
-       });
-
-}
-
-function loadUsername() {
-       jQuery("#username").html(state.name);
-}
-
-function loadMenu() {
-       jQuery.getJSON("/backend/get_menu", function(resp) {
-               if (resp.success) {
-                       var menuitems = []
-                       jQuery.each(resp.contents, function(key, val) {
-                               menuitems.push('<li><a href="' + val + '">' + key + '</li>');
+               }
+
+               this.showError = function(e, t, c) {
+                       var n = $(".alert").length;
+                       if (n>2) {
+                               $(".alert").first().remove();
+                       }
+                       error = '<div class="alert alert-block alert-' + t + '"><button type="button" class="close" data-dismiss="alert">&times;</button>' + e + '</div>'
+                       $(c).append(error);
+               }
+
+               this.loadMenu = function() {
+                       $('body').append('<div class="navbar navbar-inverse navbar-fixed-top"></div>');
+                       $('.navbar').append('<div class="navbar-inner"><div class="container-fluid"></div></div>');
+                       $('.container-fluid').append('<a class="brand" href="#">WebOS Dev</a>');
+                       $('.container-fluid').append('<div class="nav-collapse collapse menudiv"></div>');
+                       $('.menudiv').append('<div class="menuitems"></div>');
+                       $('.menudiv').append('<p class="navbar-text pull-right">Logged in as <a href="#" class="navbar-link" id="username"><em>unauthenticated</em></a></p>');
+               };
+
+               this.loadContainer = function() {
+                       $('body').append('<div id="desktop" class="container-fluid"></div>');
+                       $('desktop').append('<div class="row"></div>');
+               };
+
+               this.loadMenuItems = function() {
+                       $.getJSON("/backend/get_menu", function(resp) {
+                               if (resp.success) {
+                                       var menuitems = []
+                                       $.each(resp.contents, function(key, val) {
+                                               menuitems.push('<li><a href="' + val + '">' + key + '</li>');
+                                       });
+                                       $('<ul/>', {
+                                               'class': 'nav',
+                                               html: menuitems.join('')
+                                       }).appendTo('.menuitems');
+                               } else {
+                                       throwError(resp.error, 'error', '#desktop');
+                               }
                        });
-                       jQuery('<ul/>', {
-                               'class': 'nav',
-                               html: menuitems.join('')
-                       }).appendTo('.menuitems');
-               } else {
-                       throwError(resp.error, 'error', '#desktop');
+               };
+
+               this.hideMenu = function() {
+                       $('.menuitems').empty();
                }
-       });
 
-}
+               this.loadLogin = function() {
+                       $.ajax({
+                               url: "/backend/login_modal",
+                               success: function (data) {
+                                       $('body').append(data);
+                                       $('#loginModal').modal({
+                                               backdrop: 'static',
+                                               keyboard: false,
+                                       });
+                                       $('#loginModal').modal('show');
+                               },
+                               dataType: 'html'
+                       });
+               }
 
-function hideMenu() {
-       jQuery('.menuitems').empty();
-}
+               this.loadBackground = function() {
+                       background = '<style>body { background-image:url(\'/public/img/default-background.jpg\'); background-position: center top; } </style>'
+                       $('body').append(background);
+               };
 
-function submitLogin() {
-       loginData = {
-               'username': jQuery('#inputUsername').val(),
-               'password': jQuery('#inputPassword').val()
-       };
-       jQuery.post('/account/login', loginData, function(resp) {
-               if (resp.success) {
-                       for (key in resp.data) {
-                               state[key] = resp.data[key]
-                       }
-                       jQuery('#loginModal').modal('hide');
-                       loadUsername();
-                       loadMenu();
-                       loadBackground();
-               } else {
-                       throwError(resp.error, 'error', '.messagebody');
+               this.hideBackground = function() {
+                       $('style').remove();
+               }
+
+               this.loadUsername = function() {
+                       $("#username").html(state.name);
                }
-       }, "json");
-}
 
-function throwError(e, t, c) {
-       var n = jQuery(".alert").length;
-       if (n>2) {
-               jQuery(".alert").first().remove();
-       }
+               this.submitLogin = function() {
+                       loginData = {
+                               'username': $('#inputUsername').val(),
+                               'password': $('#inputPassword').val()
+                       };
+                       $.post('/account/login', loginData, function(resp) {
+                               if (resp.success) {
+                                       for (key in resp.data) {
+                                               state[key] = resp.data[key]
+                                       }
+                                       wos.loadUsername();
+                                       wos.loadMenuItems();
+                                       wos.loadBackground();
 
-       error = '<div class="alert alert-block alert-' + t + '"><button type="button" class="close" data-dismiss="alert">&times;</button>' + e + '</div>'
-       jQuery(c).append(error);
-}
+                                       $('#loginModal').modal('hide');
+                                       $('#inputUsername').val("")
+                                       $(".alert").remove();
+                               } else {
+                                       wos.showError(resp.error, 'error', '.messagebody');
+                               }
 
-function logout() {
-       state = {}
-       loadDefaults();
-}
+                               $('#inputPassword').val("")
+                       }, "json");
+               }
+
+               this.logout = function() {
+                       state = {}
+                       this.loadDefaults();
+               }
+
+               return this;
+       };
+})( jQuery );
 
-jQuery(function () {
-       state = {}
+$(function () {
+       wos = $(document.body).pageConstruct();
 
-       jQuery.noConflict();
-       loadDefaults();
+       wos.buildPage();
+       wos.loadDefaults();
 });