Merge branch 'master' of https://github.com/zhouyaoji/Mojito-Apps

Conflicts: dashboard/03_frame_mojit/mojits/githubMojit/controller.server.js
zhouyaoji · Mar 18, 2013 · 99a3907 · 99a3907
2 parents 904e73a + 952c81c
commit 99a3907
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 103 deletions.
diff --git a/dashboard/03_frame_mojit/application.json b/dashboard/03_frame_mojit/application.json
@@ -13,7 +13,7 @@
                   },
                  "assets": {
                     "top": {
-                        "css": ["/static/03_Frame_mojit/assets/trib.css"]
+                        "css": ["/static/03_frame_mojit/assets/trib.css"]
                     }
                  }
               }

diff --git a/dashboard/03_frame_mojit/assets/custom.css b/dashboard/03_frame_mojit/assets/custom.css
@@ -1,33 +1,19 @@
 
-div {
-    xborder: 1px solid red;
-}
-
-.frameMojit {
-    padding-top: 30px;
-}
-
-.mymodule {
-    border: 1px solid #2d2d2d;
+.mycustom {
+    border: 1px solid red;
+ /*   border: 1px solid #2d2d2d; */
     margin: 8px;
     padding: 16px;
     border-radius: 3px;
-    box-shadow: 2px 2px 2px #DDDDDD;
-
+    box-shadow: 10px 10px 5px #888888;
     /** temp until get grids going **/
     float: left;
 }
 
-.mymodule h3 {
+.mycustom h3 {
     margin: 0px;
     padding: 0px;
     font-weight: bold;
+    text-shadow: 5px 5px 5px #C0C0C0;
 }
-
-.myfooter {
-    clear: left;
-}
-
-.bodytext {
-    padding-left: 4px;
-}
+.
diff --git a/dashboard/03_frame_mojit/mojits/githubMojit/controller.server.js b/dashboard/03_frame_mojit/mojits/githubMojit/controller.server.js
@@ -22,26 +22,16 @@ YUI.add('githubMojit', function(Y, NAME) {
          *        to the Mojito API.
          */
         index: function(ac) {
-            /**
-            ac.models.get('githubMojitModelFoo').getData(function(err, data) {
-                if (err) {
-                    ac.error(err);
-                    return;
-                }
-                ac.assets.addCss('./index.css');
-                ac.done({
-                    status: 'Mojito is working.',
-                    data: data
-                });
-            });
-**/
 
             var model = ac.models.get('StatsModelYQL');
             Y.log(model);
             model.getData({}, function(data){
                 Y.log("githubmojit -index - model.getData:");
                 Y.log(data);
-                var view = ac.params.url('custom') || 'index';
+                var view = ac.params.getFromUrl('custom') || 'index';
+                if(view =='custom') {
+                   ac.assets.addCss('/static/03_frame_mojit/assets/custom.css','top');
+                }
                 ac.done({
                     title: "",
                     watchers: data.watchers,
@@ -51,5 +41,4 @@ YUI.add('githubMojit', function(Y, NAME) {
         }
 
     };
-
-}, '0.0.1', {requires: ['mojito', 'mojito-assets-addon', 'mojito-models-addon', 'githubMojitModelFoo', 'mojito-params-addon']});
+}, '0.0.1', {requires: ['mojito', 'mojito-assets-addon', 'mojito-params-addon','mojito-models-addon']});
diff --git a/dashboard/03_frame_mojit/mojits/githubMojit/views/custom.hb.html b/dashboard/03_frame_mojit/mojits/githubMojit/views/custom.hb.html
@@ -3,8 +3,8 @@ <h4>{{title}}</h4>
     <div class="mycustom">
         <h3>YUI GitHub Stats</h3>
         <ul>
-        <div class="mylist">Github watchers: <span>{{watchers}}</span></div>
-        <div class="mylist">Github forks: <span>{{forks}}</span></div>
+        <li>Github watchers: <span>{{watchers}}</span></li>
+        <li>Github forks: <span>{{forks}}</span></li>
         <ul>
     </div>
 </div>
diff --git a/frame_app/application.json b/frame_app/application.json
@@ -25,6 +25,14 @@
         "settings": [ "environment:development" ],
         "staticHandling": {
             "forceUpdate": true
+        },
+        "specs": {
+          "test": {
+             "type": "testMojit",
+             "config": {
+               "joe": "App kind of cool"
+            }
+          }
         }
     }
 ]
diff --git a/frame_app/backup_application.json b/frame_app/backup_application.json
diff --git a/frame_app/mojits/IntlHTMLFrameMojit/views/backup_template b/frame_app/mojits/IntlHTMLFrameMojit/views/backup_template
diff --git a/frame_app/routes.json b/frame_app/routes.json
@@ -4,6 +4,10 @@
        "path": "/",
        "verbs": ["get"],
        "call": "ms.index"
+   },
+   "test": {
+       "path": "/test",
+       "verbs": ["get"],
+       "call": "test.index"
    }
-
 }]