Changeset 831

Timestamp:

Mar 26, 2015 2:52:37 PM (10 years ago)

Author:

quyenla

Message:

 

Location:

pro-violet-viettel/www/deploy/20150304

Files:

• application/modules/ajax/controllers/download.php (added)
• application/modules/ajax/views/preview/index.php (modified) (1 diff)
• application/modules/frontend/views/lecture_editor.php (modified) (1 diff)
• application/views/layout/header.php (modified) (1 diff)
• assets/js/frontend/lecture.js (modified) (4 diffs)
• assets/js/manager.js (modified) (2 diffs)

pro-violet-viettel/www/deploy/20150304/application/modules/ajax/views/preview/index.php

@@ -5 +5 @@
         { 
         ?>
-    <a href="http://sbgapi.violet.vn/<?php echo $folder."/".$i;?>.png"><img src="http://sbgapi.violet.vn/<?php echo $folder."/".$i;?>.png" title="Trang <?php echo ($i+1);?>" alt="Trang <?php echo ($i+1);?>"></a>
+    <a href="<?php echo $this->config->item('api_url').$folder."/".$i;?>.png"><img src="<?php echo $this->config->item('api_url').$folder."/".$i;?>.png" title="Trang <?php echo ($i+1);?>" alt="Trang <?php echo ($i+1);?>"></a>
     <?php
     }?>

pro-violet-viettel/www/deploy/20150304/application/modules/frontend/views/lecture_editor.php

@@ -118 +118 @@
     var us_id="<?php echo $us_id;?>";
     var is_overdate = <?php echo $isOverDate;?>;
-    var fileid = <?php echo $fileid;?>;
+    var fileid = "<?php echo $fileid;?>";
 
 </script>               

pro-violet-viettel/www/deploy/20150304/application/views/layout/header.php

@@ -11 +11 @@
 <link rel="stylesheet" href="<?php echo base_url();?>assets/css/style2.css" />
 <script src="<?php echo base_url();?>assets/js/jwplayer.js" ></script> 
-
-                <script>jwplayer.key="0Wkdd5AMtD70O47y3hnZXqCG9CjnX1csi7+foQ==";</script>
-        </head>
+<script>jwplayer.key="0Wkdd5AMtD70O47y3hnZXqCG9CjnX1csi7+foQ==";</script>
+<script type="text/javascript">
+    var api_url = "<?php echo $this->config->item('api_url'); ?>";
+</script>
+</head>

pro-violet-viettel/www/deploy/20150304/assets/js/frontend/lecture.js

@@ -9 +9 @@
 if (p_period == -1 && is_overdate == 1)
 {
-        $('#alert-trial-services').modal('show');
-        $('#alert-trial-services').on('hidden.bs.modal', function () {
-                if (update_user_info == "1")
-                {
-                        $('#update_user_info').modal({backdrop: 'static',keyboard: false,});
-                }
-        }); 
+    $('#alert-trial-services').modal('show');
+    $('#alert-trial-services').on('hidden.bs.modal', function () {
+        if (update_user_info == "1")
+        {
+            $('#update_user_info').modal({backdrop: 'static', keyboard: false, });
+        }
+    });
 }
 else
 {
-        if (update_user_info == "1")
-        {
-                $('#update_user_info').modal({backdrop: 'static'});
-        }
+    if (update_user_info == "1")
+    {
+        $('#update_user_info').modal({backdrop: 'static'});
+    }
 }
 
@@ -54 +54 @@
     console.log('Show modal!');
     $('#alert-services-package').modal('show');
-        //$('#alert-services-package-bk').modal('show');
+    //$('#alert-services-package-bk').modal('show');
 }
 
@@ -124 +124 @@
 }
 
-function DoCloseLecture () {
-        g_Flash.SetVariable("command", "Quit App");             
-}
-
-function getLectureState () {
-        var state = g_Flash.GetVariable("dataChanged");
-        return state == 'true' ? true: (state == 'false' ? false:false);
+function DoCloseLecture() {
+    g_Flash.SetVariable("command", "Quit App");
+}
+
+function getLectureState() {
+    var state = g_Flash.GetVariable("dataChanged");
+    return state == 'true' ? true : (state == 'false' ? false : false);
 }
 
@@ -174 +174 @@
 
 $(document).ready(function () {
-      InitViolet();
-    if(fileid!="")
-    { 
-        console.log('http://sbgapi.violet.vn/space/file/id/'+fileid);
-    DoOpenLecture('http://sbgapi.violet.vn/space/file/id/'+fileid);
-    } 
-        var inFormOrLink = false;
-
-        $(window).on('beforeunload', function() {
-                var e = $.Event('webapp:page:closing');
-                $(window).trigger(e); // let other modules determine whether to prevent closing
-                if(e.isDefaultPrevented()) {
-                        return e.message;
-                }
-        });
-
-        $(window).on('webapp:page:closing', function(e) {
-                if(getLectureState()) {
-                        e.preventDefault();
-                        e.message = 'Bạn đang soạn bà i giảng và  chÆ°a lÆ°u dữ liệu. Bạn có muốn chuyển khỏi ứng dụng khÃŽng?';
-                }
-        });
-
+    InitViolet();
+    var inFormOrLink = false;
+
+    $(window).on('beforeunload', function () {
+        var e = $.Event('webapp:page:closing');
+        $(window).trigger(e); // let other modules determine whether to prevent closing
+        if (e.isDefaultPrevented()) {
+            return e.message;
+        }
+    });
+
+    $(window).on('webapp:page:closing', function (e) {
+        if (getLectureState()) {
+            e.preventDefault();
+            e.message = 'Bạn đang soạn bà i giảng và  chÆ°a lÆ°u dữ liệu. Bạn có muốn chuyển khỏi ứng dụng khÃŽng?';
+        }
+    });
+    setTimeout(function () {
+        if (fileid != "")
+        {
+            DoOpenLecture(api_url+'space/file/id/' + fileid);
+        }
+
+    }, 1000);
 })
 

pro-violet-viettel/www/deploy/20150304/assets/js/manager.js

@@ -442 +442 @@
                     var promptOptions = {
                         title: "Tải lên",
-                        message: "<form id='upload' method='post'  action='http://sbgapi.violet.vn/space/upload' enctype='multipart/form-data'><div id='drop'>Kéo thả tệp và o đây <a> Chọn tệp </a><input type='hidden' name='response' value='1'/><input type='hidden' name='dir' value='" + self.getTreeCurrentNode() + "'/><input type='hidden' name='userid' value='"+userid+"'/><input type='file' name='upload_file' multiple /></div><ul></ul></form>",
+                        message: "<form id='upload' method='post'  action='"+api_url+"space/upload' enctype='multipart/form-data'><div id='drop'>Kéo thả tệp và o đây <a> Chọn tệp </a><input type='hidden' name='response' value='1'/><input type='hidden' name='dir' value='" + self.getTreeCurrentNode() + "'/><input type='hidden' name='userid' value='"+userid+"'/><input type='file' name='upload_file' multiple /></div><ul></ul></form>",
                         buttons: {
                             success: {
@@ -481 +481 @@
                     }
                    
-                    if($.inArray( $ext, [ "flv", "mp4","avi"])>=0)
+                    if($.inArray( $ext, [ "flv", "mp4","avi","m4v"])>=0)
                    { 
                         $.ajax({