Permalink
Browse files

Merge branch 'master' of github.com:CucutaTecnologica/Visor-de-Confer…

…encias-y-Twitter-Stream

Conflicts:
	app/webroot/css/app.css
  • Loading branch information...
2 parents 68e18ed + e32033e commit cfe6131a912c32db96014cf0ba8d3f654304ed1b Alexandra Vargas committed Apr 28, 2012
@@ -1,2 +1,3 @@
+#Thu Apr 26 23:18:53 COT 2012
eclipse.preferences.version=1
-include_path=0;/flisol
+include_path=0;/visor
@@ -6,3 +6,4 @@ class DATABASE_CONFIG {
'database' => DB_FILE
);
}
+
@@ -4,7 +4,29 @@ class CountController extends Controller {
public function index(){
$helpers = array('Html');
// Aqui se debe traer hasta que fecha-hora va la conferencia.
- $this->set("time", "xd");
+ // Por ahora fecha estatica para simular
+ $start = "2012-04-26 07:01:20";
+
+ // Tiempo en minutos, dato estatico para ser simulado. Se debe traer
+ // del campo duration.
+ $duration = 45;
+ $duration *= 60;
+
+ $tmp = explode(" ", $start);
+ $time = explode(":", $tmp[1]);
+ $date = explode("-", $tmp[0]);
+ $start_unix = mktime($time[0], $time[1], $time[2], $date[1], $date[2], $date[0]);
+ $start_unix += $duration;
+
+ $r = array();
+ $r["year"] = date("Y", $start_unix);
+ $r["month"] = date("m", $start_unix);
+ $r["day"] = date("d", $start_unix);
+ $r["min"] = date("i", $start_unix);
+ $r["sec"] = date("s", $start_unix);
+ $r["hour"] = date("H", $start_unix);
+ //debug($r);
+ $this->set("data", $r);
$this->render();
}
}
View
0 app/Model/Author.php 100644 → 100755
No changes.
View
0 app/Model/Conference.php 100644 → 100755
No changes.
View
0 app/Model/Event.php 100644 → 100755
No changes.
View
0 app/Model/User.php 100644 → 100755
No changes.
No changes.
No changes.
No changes.
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
@@ -8,13 +8,17 @@
?>
<h2>Test Contador</h2>
-<div id="countdown"></div>
-<script type="text/javascript" charset="UTF-8">
- var newYear = new Date();
- newYear = new Date(newYear.getFullYear() + 1, 1 - 1, 1);
- //$('#countdown').countdown($.countdown.regional['es']);
- $("#countdown").countdown({until: newYear});
- alert("xd");
+<div id="countdown_p"></div>
+<script type="text/javascript" charset="UTF-8">
+ var limit = new Date(
+ <?php echo $data["year"]; ?>,
+ <?php echo $data["month"]-1; ?>,
+ <?php echo $data["day"]; ?>,
+ <?php echo $data["hour"]; ?>,
+ <?php echo $data["min"]; ?>,
+ <?php echo $data["sec"]; ?>
+ );
+ //$("#countdown_p").countdown($.countdown.regional['es']);
+ $("#countdown_p").countdown({until: limit});
+ alert(limit);
</script>
-
-
@@ -10,3 +10,13 @@
font-size:14px;
padding-left: 60px;
}
+<<<<<<< HEAD
+=======
+
+div#countdown_p{
+ text-align: center;
+ display: block;
+ width: 200px;
+ height: 60px;
+}
+>>>>>>> e32033eb31a5f0a60f3e8e05f72e75dacd27ec83

0 comments on commit cfe6131

Please sign in to comment.