Some Improvements

Adding jquery oEmbed

Some Improvements
Adding jquery oEmbed
fd943877 · Kevin · c3461ec0 · fd943877 · fd943877 · fd943877
Commit fd943877 authored Apr 19, 2014 by Kevin
9 changed files
--- a/css/jquery.oembed.css
+++ b/css/jquery.oembed.css
+div.oembedall-githubrepos  {
+    border: 1px solid #DDD;
+    border-radius: 4px 4px 4px 4px;
+    list-style-type: none;
+    margin: 0 0 10px;
+    padding: 8px 10px 0;
+    font: 13.34px/1.4 helvetica,arial,freesans,clean,sans-serif;
+    /*background: url("http://github.com/images/icons/public.png") no-repeat scroll 6px 9px transparent;*/
+    width : 452px;
+    background-color:#fff;
+}
+
+div.oembedall-githubrepos .oembedall-body {
+    background: -moz-linear-gradient(center top , #FAFAFA, #EFEFEF) repeat scroll 0 0 transparent;
+    background:  -webkit-gradient(linear,left top,left bottom,from(#FAFAFA),to(#EFEFEF));;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top: 1px solid #EEE;
+    margin-left: -10px;
+    margin-top: 8px;
+    padding: 5px 10px;
+    width: 100%;
+}
+
+div.oembedall-githubrepos h3 {
+    font-size: 14px;
+    margin: 0;
+    padding-left: 18px;
+    white-space: nowrap;
+}
+
+div.oembedall-githubrepos p.oembedall-description {
+    color: #444;
+    font-size: 12px;
+    margin: 0 0 3px;
+}
+
+div.oembedall-githubrepos p.oembedall-updated-at {
+    color: #888;
+    font-size: 11px;
+    margin: 0;
+}
+
+div.oembedall-githubrepos ul.oembedall-repo-stats {
+    /*background: url("http://github.com/images/modules/pagehead/actions_fade.png") no-repeat scroll 0 0 transparent;*/
+    border: medium none;
+    float: right;
+    font-size: 11px;
+    font-weight: bold;
+    padding-left: 15px;
+    position: relative;
+    z-index: 5;
+    margin:0;
+}
+div.oembedall-githubrepos ul.oembedall-repo-stats li {
+    border: medium none;
+    color: #666;
+    display: inline-block;
+    list-style-type: none;
+    margin: 0 !important;
+}
+div.oembedall-githubrepos ul.oembedall-repo-stats li a {
+    background-color: transparent;
+    background-position: 5px -2px;
+    border: medium none;
+    color: #666 !important;
+    background-position: 5px -2px;
+    background-repeat: no-repeat;
+    border-left: 1px solid #DDD;
+    display: inline-block;
+    height: 21px;
+    line-height: 21px;
+    padding: 0 5px 0 23px;
+}
+
+
+div.oembedall-githubrepos ul.oembedall-repo-stats li:first-child a {
+    border-left: medium none;
+    margin-right: -3px;
+}
+div.oembedall-githubrepos ul.oembedall-repo-stats li a:hover {
+    background: none no-repeat scroll 5px -27px #4183C4;
+    color: #FFFFFF !important;
+    text-decoration: none;
+}
+div.oembedall-githubrepos ul.oembedall-repo-stats li:first-child a:hover {
+    border-bottom-left-radius: 3px;
+    border-top-left-radius: 3px;
+}
+ul.oembedall-repo-stats li:last-child a:hover {
+    border-bottom-right-radius: 3px;
+    border-top-right-radius: 3px;
+}
+div.oembedall-githubrepos ul.oembedall-repo-stats li.oembedall-watchers a {
+    /*background-image: url("http://github.com/images/modules/pagehead/repostat_watchers.png");*/
+}
+
+div.oembedall-githubrepos ul.oembedall-repo-stats li.oembedall-forks a {
+    /*background-image: url("http://github.com/images/modules/pagehead/repostat_forks.png");*/
+}
+
+
+span.oembedall-closehide{
+  background-color: #aaa;
+  border-radius: 2px;
+  cursor: pointer;
+  margin-right: 3px;
+}
+
+div.oembedall-container {
+ margin-top : 5px;
+ text-align: left;
+}
+
+.oembedall-ljuser {
+    font-weight: bold;
+}
+
+.oembedall-ljuser img {
+    vertical-align: bottom;
+    border: 0;
+    padding-right: 1px;
+}
+
+.oembedall-stoqembed {
+    border-bottom: 1px dotted #999999;
+    float: left;
+    overflow: hidden;
+    padding: 11px 0;
+    width: 730px;
+    line-height: 1;
+    background: none repeat scroll 0 0 #FFFFFF;
+    color: #000000;
+    font-family: Arial,Liberation Sans,DejaVu Sans,sans-serif;
+    font-size: 80%;
+    text-align: left;
+    margin: 0;
+    padding: 0;
+}
+
+.oembedall-stoqembed a {
+    color: #0077CC;
+    text-decoration: none;
+    margin: 0;
+    padding: 0;
+}
+.oembedall-stoqembed a:hover {
+    text-decoration: underline;
+}
+.oembedall-stoqembed a:visited {
+    color: #4A6B82;
+}
+
+.oembedall-stoqembed h3 {
+    font-family: Trebuchet MS,Liberation Sans,DejaVu Sans,sans-serif;
+    font-size: 130%;
+    font-weight: bold;
+    margin: 0;
+    padding: 0;
+}
+
+.oembedall-stoqembed .oembedall-reputation-score {
+    color: #444444;
+    font-size: 120%;
+    font-weight: bold;
+    margin-right: 2px;
+}
+
+
+.oembedall-stoqembed .oembedall-user-info {
+    height: 35px;
+    width: 185px;
+}
+.oembedall-stoqembed .oembedall-user-info .oembedall-user-gravatar32 {
+    float: left;
+    height: 32px;
+    width: 32px;
+}
+
+.oembedall-stoqembed .oembedall-user-info .oembedall-user-details {
+    float: left;
+    margin-left: 5px;
+    overflow: hidden;
+    white-space: nowrap;
+    width: 145px;
+}
+
+.oembedall-stoqembed .oembedall-question-hyperlink {
+    font-weight: bold;
+}
+
+.oembedall-stoqembed .oembedall-stats {
+    background: none repeat scroll 0 0 #EEEEEE;
+    margin: 0 0 0 7px;
+    padding: 4px 7px 6px;
+    width: 58px;
+}
+.oembedall-stoqembed .oembedall-statscontainer {
+    float: left;
+    margin-right: 8px;
+    width: 86px;
+}
+
+.oembedall-stoqembed .oembedall-votes {
+    color: #555555;
+    padding: 0 0 7px;
+    text-align: center;
+}
+
+.oembedall-stoqembed .oembedall-vote-count-post {
+    display: block;
+    font-size: 240%;
+    color: #808185;
+    display: block;
+    font-weight: bold;
+}
+
+
+.oembedall-stoqembed .oembedall-views {
+    color: #999999;
+    padding-top: 4px;
+    text-align: center;
+}
+
+.oembedall-stoqembed .oembedall-status {
+    margin-top: -3px;
+    padding: 4px 0;
+    text-align: center;
+    background: none repeat scroll 0 0 #75845C;
+    color: #FFFFFF;
+}
+
+.oembedall-stoqembed .oembedall-status strong {
+    color: #FFFFFF;
+    display: block;
+    font-size: 140%;
+}
+
+
+.oembedall-stoqembed .oembedall-summary {
+    float: left;
+    width: 635px;
+}
+
+.oembedall-stoqembed .oembedall-excerpt {
+    line-height: 1.2;
+    margin: 0;
+    padding: 0 0 5px;
+}
+
+.oembedall-stoqembed .oembedall-tags {
+    float: left;
+    line-height: 18px;
+}
+.oembedall-stoqembed .oembedall-tags a:hover {
+    text-decoration: none;
+}
+
+.oembedall-stoqembed .oembedall-post-tag {
+    background-color: #E0EAF1;
+    border-bottom: 1px solid #3E6D8E;
+    border-right: 1px solid #7F9FB6;
+    color: #3E6D8E;
+    font-size: 90%;
+    line-height: 2.4;
+    margin: 2px 2px 2px 0;
+    padding: 3px 4px;
+    text-decoration: none;
+    white-space: nowrap;
+}
+.oembedall-stoqembed .oembedall-post-tag:hover {
+    background-color: #3E6D8E;
+    border-bottom: 1px solid #37607D;
+    border-right: 1px solid #37607D;
+    color: #E0EAF1;
+}
+
+
+.oembedall-stoqembed .oembedall-fr {
+    float: right;
+}
+
+.oembedall-stoqembed .oembedall-statsarrow {
+    background-image: url("http://cdn.sstatic.net/stackoverflow/img/sprites.png?v=3");
+    background-repeat: no-repeat;
+    overflow: hidden;
+    background-position: 0 -435px;
+    float: right;
+    height: 13px;
+    margin-top: 12px;
+    width: 7px;
+}
+
+.oembedall-facebook1 {
+    border: #1A3C6C solid 1px;
+    padding:0px;
+    font: 13.34px/1.4 verdana;
+    width : 500px;
+    
+}
+
+.oembedall-facebook2 {
+    background-color: #627add;    
+}
+.oembedall-facebook2 a {
+  color: #e8e8e8;
+  text-decoration:none;
+}
+
+.oembedall-facebookBody {
+  background-color: #fff;
+  vertical-align: top;
+  padding: 5px;
+}
+
+.oembedall-facebookBody .contents {
+    display: inline-block;
+    width: 100%;
+}
+
+.oembedall-facebookBody div img {
+    float: left;
+    margin-right: 5px;
+}
+
+div.oembedall-lanyard{
+-webkit-box-shadow: none;
+-webkit-transition-delay: 0s;
+-webkit-transition-duration: 0.4000000059604645s;
+-webkit-transition-property: width;
+-webkit-transition-timing-function: cubic-bezier(0.42, 0, 0.58, 1);
+background-attachment: scroll;
+background-clip: border-box;
+background-color: transparent;
+background-image: none;
+background-origin: padding-box;
+border-bottom-width: 0px;
+border-left-width: 0px;
+border-right-width: 0px;
+border-top-width: 0px;
+box-shadow: none;
+color: #112644;
+display: block;
+float: left;
+font-family: 'Trebuchet MS', Trebuchet, sans-serif;
+font-size: 16px;
+height: 253px;
+line-height: 19px;
+margin-bottom: 0px;
+margin-left: 0px;
+margin-right: 0px;
+margin-top: 0px;
+max-width: none;
+min-height: 0px;
+outline-color: #112644;
+outline-style: none;
+outline-width: 0px;
+overflow-x: visible;
+overflow-y: visible;
+padding-bottom: 0px;
+padding-left: 0px;
+padding-right: 0px;
+padding-top: 0px;
+position: relative;
+text-align: left;
+vertical-align: baseline;
+width: 804px;
+}
+
+div.oembedall-lanyard .tagline{
+  font-size: 1.5em;
+}
+
+div.oembedall-lanyard .wrapper{
+  overflow: hidden;
+  clear: both;
+}
+div.oembedall-lanyard .split{
+  float: left;
+display: inline;
+
+}
+
+div.oembedall-lanyard .prominent-place .flag:link, div.oembedall-lanyard .prominent-place .flag:visited,div.oembedall-lanyard .prominent-place .flag:hover
+  ,div.oembedall-lanyard .prominent-place .flag:focus,div.oembedall-lanyard .prominent-place .flag:active {
+float: left;
+display: block;
+width: 48px;
+height: 48px;
+position: relative;
+top: -5px;
+margin-right: 10px;
+}
+
+div.oembedall-lanyard .place-context {
+font-size: 0.889em;
+}
+
+div.oembedall-lanyard .prominent-place .sub-place {
+display: block;
+}
+
+div.oembedall-lanyard .prominent-place{
+  font-size: 1.125em;
+line-height: 1.1em;
+font-weight: normal;
+
+}
+
+div.oembedall-lanyard .main-date{
+color: #8CB4E0;
+font-weight: bold;
+line-height: 1.1;
+
+}
+
+div.oembedall-lanyard .first{
+  margin-left: 0;
+  width: 48.57%;
+margin: 0 0 0 2.857%;
+
+}
--- a/js/jquery.oembed.js
+++ b/js/jquery.oembed.js
--- a/protected/controllers/MessageController.php
+++ b/protected/controllers/MessageController.php
@@ -30,38 +30,38 @@ class MessageController extends Controller {
            //Schicke alle 10 Sekunden neue Nachrichten
            //Lade Nachrichten der letzten 24 Stunden (max 10 Nachrichten)
            $criteria = new CDbCriteria;
-            $criteria->select = 'id, text, created';
+            $criteria->select = 'id, text, created, infotype';
            $criteria->addCondition('board = "1"');
            $criteria->addCondition('deleted IS NULL');



            if ($lastPushedMessageID == 0) {
-                $aDay = 60 * 60 * 24 * 7;
+                $aDay = 60 * 60 * 24;
                $now = new CDbExpression("(NOW()-$aDay)");
                $criteria->addCondition('created > "' . $now . '"');
+                $criteria->order = "id DESC"; //id DESC
            } else {
                $criteria->addCondition('published = "0"');
                $criteria->addCondition('id > "' . $lastPushedMessageID . '"');
            }

            $criteria->limit = 10;
-            $criteria->order = "id ASC"; //id DESC

            $messages = Messages::model()->findAll($criteria);
-            var_dump($messages);

            if (is_array($messages)) {
+                if ($lastPushedMessageID == 0) {
+                    $messages = array_reverse($messages);
+                }
                foreach ($messages as $message) {
-                    //Wenn ID groesser als zuletzt gesendete Nachricht, schicke wieder raus.
-                    if ($message->id > $lastPushedMessageID) {
                        echo "event:messages\n";
                        echo "id:$message->id\n";
-                        $data = json_encode(array("text" => $message->text, "created" => $message->created));
+                        $data = json_encode(array("text" => $message->text, "created" => $message->created, "infotype" => $message->infotype));
                        echo "data:$data\n";
                        echo "\n\n";
                        $lastPushedMessageID = $message->id;
-                    }
+                    
                }
            } else {
                if (!$messages->id) {
@@ -89,8 +89,9 @@ class MessageController extends Controller {
        if (isset($_POST['message'])) {

            $this->model->text = $_POST['message'];
-            $this->model->board = 1;
-            
+            $this->model->board = $_POST['board'];
+            $this->model->infotype = $_POST['infotype'];
+
            if ($this->model->validate()) {
                if ($this->model->save()) {
                    // Validate ok! Saving your data from form okay!
@@ -109,7 +110,7 @@ class MessageController extends Controller {
            // Validate not ok! 
 // Send a response back!
            header('Content-type: application/json');
-            echo json_encode(array('result' => false, 'data' => 'No Valid Data')); // Use CJSON::encode() instead of json_encode() if you are encoding a Yii model
+            echo json_encode(array('result' => false, 'data' => 'Validation Failed, No Valid Data', 'postdata' => $_POST)); // Use CJSON::encode() instead of json_encode() if you are encoding a Yii model
            Yii::app()->end(); // Properly end the appÏ
        }
    }

--- a/protected/runtime/application.log
+++ b/protected/runtime/application.log
@@ -9466,3 +9466,71 @@ Stack trace:
 REQUEST_URI=/werkstatt/message/push2
 in /Users/kkrieger/htdocs/werkstatt/protected/controllers/MessageController.php (75)
 in /Users/kkrieger/htdocs/werkstatt/index.php (13)
+2014/04/19 10:31:49 [error] [php] Undefined index: board (/Users/kkrieger/htdocs/werkstatt/protected/controllers/MessageController.php:92)
+Stack trace:
+#0 /Users/kkrieger/htdocs/yii1114/framework/web/CController.php(286): MessageController->runAction()
+#1 /Users/kkrieger/htdocs/yii1114/framework/web/CController.php(265): MessageController->runActionWithFilters()
+#2 /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php(282): MessageController->run()
+#3 /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php(141): CWebApplication->runController()
+#4 /Users/kkrieger/htdocs/yii1114/framework/base/CApplication.php(180): CWebApplication->processRequest()
+#5 /Users/kkrieger/htdocs/werkstatt/index.php(13): CWebApplication->run()
+REQUEST_URI=/werkstatt/message/ajax
+in /Users/kkrieger/htdocs/werkstatt/protected/controllers/MessageController.php (92)
+in /Users/kkrieger/htdocs/werkstatt/index.php (13)
+2014/04/19 10:38:23 [error] [php] Undefined index: infotype (/Users/kkrieger/htdocs/werkstatt/protected/controllers/MessageController.php:93)
+Stack trace:
+#0 /Users/kkrieger/htdocs/yii1114/framework/web/CController.php(286): MessageController->runAction()
+#1 /Users/kkrieger/htdocs/yii1114/framework/web/CController.php(265): MessageController->runActionWithFilters()
+#2 /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php(282): MessageController->run()
+#3 /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php(141): CWebApplication->runController()
+#4 /Users/kkrieger/htdocs/yii1114/framework/base/CApplication.php(180): CWebApplication->processRequest()
+#5 /Users/kkrieger/htdocs/werkstatt/index.php(13): CWebApplication->run()
+REQUEST_URI=/werkstatt/message/ajax
+in /Users/kkrieger/htdocs/werkstatt/protected/controllers/MessageController.php (93)
+in /Users/kkrieger/htdocs/werkstatt/index.php (13)
+2014/04/19 11:05:46 [error] [exception.CHttpException.404] exception 'CHttpException' with message 'The system is unable to find the requested action "view".' in /Users/kkrieger/htdocs/yii1114/framework/web/CController.php:483
+Stack trace:
+#0 /Users/kkrieger/htdocs/yii1114/framework/web/CController.php(270): CController->missingAction('view')
+#1 /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php(282): CController->run('view')
+#2 /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php(141): CWebApplication->runController('message/view')
+#3 /Users/kkrieger/htdocs/yii1114/framework/base/CApplication.php(180): CWebApplication->processRequest()
+#4 /Users/kkrieger/htdocs/werkstatt/index.php(13): CApplication->run()
+#5 {main}
+REQUEST_URI=/werkstatt/message/2
+---
+2014/04/19 11:31:36 [error] [exception.CHttpException.404] exception 'CHttpException' with message 'Unable to resolve the request "src/bootstrap-wysihtml5.js".' in /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php:286
+Stack trace:
+#0 /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php(141): CWebApplication->runController('src/bootstrap-w...')
+#1 /Users/kkrieger/htdocs/yii1114/framework/base/CApplication.php(180): CWebApplication->processRequest()
+#2 /Users/kkrieger/htdocs/werkstatt/index.php(13): CApplication->run()
+#3 {main}
+REQUEST_URI=/werkstatt/src/bootstrap-wysihtml5.js
+HTTP_REFERER=http://localhost/werkstatt/message/new
+---
+2014/04/19 11:31:39 [error] [exception.CHttpException.404] exception 'CHttpException' with message 'Unable to resolve the request "src/bootstrap-wysihtml5.js".' in /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php:286
+Stack trace:
+#0 /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php(141): CWebApplication->runController('src/bootstrap-w...')
+#1 /Users/kkrieger/htdocs/yii1114/framework/base/CApplication.php(180): CWebApplication->processRequest()
+#2 /Users/kkrieger/htdocs/werkstatt/index.php(13): CApplication->run()
+#3 {main}
+REQUEST_URI=/werkstatt/src/bootstrap-wysihtml5.js
+HTTP_REFERER=http://localhost/werkstatt/message/new
+---
+2014/04/19 11:42:18 [error] [exception.CHttpException.404] exception 'CHttpException' with message 'Unable to resolve the request "css/jquery.oembed.css".' in /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php:286
+Stack trace:
+#0 /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php(141): CWebApplication->runController('css/jquery.oemb...')
+#1 /Users/kkrieger/htdocs/yii1114/framework/base/CApplication.php(180): CWebApplication->processRequest()
+#2 /Users/kkrieger/htdocs/werkstatt/index.php(13): CApplication->run()
+#3 {main}
+REQUEST_URI=/werkstatt/css/jquery.oembed.css
+HTTP_REFERER=http://localhost/werkstatt/message/new
+---
+2014/04/19 11:42:21 [error] [exception.CHttpException.404] exception 'CHttpException' with message 'Unable to resolve the request "css/jquery.oembed.css".' in /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php:286
+Stack trace:
+#0 /Users/kkrieger/htdocs/yii1114/framework/web/CWebApplication.php(141): CWebApplication->runController('css/jquery.oemb...')
+#1 /Users/kkrieger/htdocs/yii1114/framework/base/CApplication.php(180): CWebApplication->processRequest()
+#2 /Users/kkrieger/htdocs/werkstatt/index.php(13): CApplication->run()
+#3 {main}
+REQUEST_URI=/werkstatt/css/jquery.oembed.css
+HTTP_REFERER=http://localhost/werkstatt/message/new
+---
--- a/protected/views/layouts/main.php
+++ b/protected/views/layouts/main.php
@@ -33,7 +33,13 @@
        <link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/css/main.css" />
        <link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/css/form.css" />

-        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+
+        <!-- jquery.oembed -->
+        <link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/css/jquery.oembed.css" />
+        <script src= "<?php echo Yii::app()->request->baseUrl; ?>/js/jquery.oembed.js"></script>
+        <!-- end jquery.oembed -->


    </head>
@@ -42,7 +48,7 @@

        <!--
        <div id="header">
-            <div id="logo"><?php //echo CHtml::encode(Yii::app()->name);     ?></div>
+            <div id="logo"><?php //echo CHtml::encode(Yii::app()->name);           ?></div>
        </div><!-- header -->

        <div class="navbar navbar-default navbar-fixed-top" role="navigation">
@@ -68,7 +74,7 @@
                        </a>
                    </li>
                </ul>
-                
+
            </div>
        </div>

@@ -79,8 +85,8 @@
            ));
            ?><!-- breadcrumbs -->
        <?php endif ?>
-            
-            
+
+
        <?php echo $content; ?>

        <div class="clear"></div>

--- a/protected/views/message/index.php
+++ b/protected/views/message/index.php
@@ -30,23 +30,31 @@


 <script>
-    if (typeof(EventSource) !== "undefined")
+    if (typeof (EventSource) !== "undefined")
    {
-   
+
        var source = new EventSource("<?php echo Yii::app()->createAbsoluteUrl("message/sse/"); ?>");

        source.addEventListener('messages', function(result) {
            if (('#' + result.lastEventId) !== '') {
                $('#messages').prepend('<div id="' + result.lastEventId + '"><div class=" pull-right panel-heading"></div><div class="panel-body"></div></div>');