json-object-editor 0.10.223 → 0.10.225

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## CHANGELOG
 
 ### 0.10.200
+	225 - fixed list issues, capp toggle 
+	224 - manifest.json & capp menu
 	223 - list custom items updated
 	220 - updated user, added ability for manifest.js
 		- updated AWS uploaders

package/capp/capp.css

@@ -429,6 +429,7 @@ capp-header capp-menu-panel{
 }
 capp-menu-panel > capp-menu-option{
     padding:0 5px;
+    font-size: 16px;
 }
 capp-menu-option:after,
 capp-menu-content:after,
@@ -468,6 +469,7 @@ capp-menu-option-bonus{
 
 .capp-retro capp-menu-option.selected {
     background-color: rgba(0,0,0,.1);
+    font-weight:bold;
 }
 
 html.no-touch capp-menu-option-bonus:hover{
@@ -1063,10 +1065,10 @@ capp-toggles > capp-button{
 }
 capp-toggles > capp-button > svg {
     float: left;
-    width: 40px;
+    width: 20px;
     fill: #999;
     margin-left: -10px;
-    padding-top:2px;
+    padding-top: 12px;
 }
 capp-toggles > capp-button.active{
     background:#f2f2f2;

package/css/joe-styles.css

@@ -2006,6 +2006,10 @@ joe-list-item.deletable {
     position: relative;
     border-bottom:1px solid #eee;
 }
+.joe-panel-content-option-expander joe-list-item.custom-item {
+    padding: 10px;
+    margin: 10px 0;
+}
 swipe-option{
     position:absolute;
     top:0;

package/css/joe.css

@@ -2492,6 +2492,10 @@ joe-list-item.deletable {
     position: relative;
     border-bottom:1px solid #eee;
 }
+.joe-panel-content-option-expander joe-list-item.custom-item {
+    padding: 10px;
+    margin: 10px 0;
+}
 swipe-option{
     position:absolute;
     top:0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-object-editor",
-  "version": "0.10.223",
+  "version": "0.10.225",
   "description": "JOE the Json Object Editor | Platform Edition",
   "main": "app.js",
   "scripts": {

package/pages/template.html

@@ -6,10 +6,10 @@
 	<meta name='viewport' content='initial-scale=1.0, user-scalable=no' >
 	<title> ${this.webconfig.name} > ${APPNAME} </title>
 	<script src="/JsonObjectEditor/js/libs/adapter-latest.js"></script>
-	<!-- <link rel="shortcut icon" href="/JsonObjectEditor/favicon.ico" type="image/x-icon">
+	<link rel="shortcut icon" href="/JsonObjectEditor/favicon.ico" type="image/x-icon">
 	<link rel="icon" href="/JsonObjectEditor/favicon.ico" type="image/x-icon">
 	<link rel="icon" sizes="192x192" href="/JsonObjectEditor/img/ico/android-icon-192x192.png">
-	<link rel="apple-touch-icon" sizes="144x144" href="/JsonObjectEditor/img/ico/android-icon-144x144.png" /> -->
+	<link rel="apple-touch-icon" sizes="144x144" href="/JsonObjectEditor/img/ico/android-icon-144x144.png" />
 
 	<meta name="joe-notes" content="template.html template" >
 	<meta name="apple-mobile-web-app-capable" content="yes">
@@ -18,6 +18,10 @@
 	<link rel="stylesheet" href="${JOEPATH}js/plugins/c3/c3.min.css"/>
 	<link rel="stylesheet" href="${JOEPATH}capp/capp.css"/>
 	<link href="/JsonObjectEditor/css/joe.css" rel="stylesheet" type="text/css"/>
+	<!--manifest.json-->	
+	<link rel="manifest" href="/manifest.json">
+	
+	<!--this.settings.joe_icons-->
 	${this.settings.joe_icons}
 	<!--<script src="${JOEPATH}_joeinclude.js"></script>-->
 	

package/server/apps/projectboard.js

@@ -132,9 +132,9 @@ var ProjectBoard = function(){
                     }
                     var togglers = 
                         `<capp-toggles>
-                        <capp-button class="`+active[0]+`" data-toggle="projects" onclick="capp.Toggle.toggle(\'projects\')">`+_joe.schemas.project.menuicon+`<big>Projects</big> (`+pcount+`)</capp-button>
-                        <capp-button class="`+active[1]+`" data-toggle="tasks" onclick="capp.Toggle.toggle(\'tasks\')">`+_joe.schemas.task.menuicon+`<big>Tasks</big> (`+tcount+`)</capp-button>
-                        <capp-button class="`+active[2]+`" data-toggle="pending" onclick="capp.Toggle.toggle(\'pending\')">`+_joe.schemas.instance.menuicon+`<big>Pending</big> (`+pending_count+`)</capp-button>
+                        <capp-button class="`+active[0]+`" data-toggle="projects" onclick="capp.Toggle.toggle(\'projects\')">`+_joe.schemas.project.menuicon+`Projects <small>(`+pcount+`)</small></capp-button>
+                        <capp-button class="`+active[1]+`" data-toggle="tasks" onclick="capp.Toggle.toggle(\'tasks\')">`+_joe.schemas.task.menuicon+`Tasks <small>(`+tcount+`)</small></capp-button>
+                        <capp-button class="`+active[2]+`" data-toggle="pending" onclick="capp.Toggle.toggle(\'pending\')">`+_joe.schemas.instance.menuicon+`Pending <small>(`+pending_count+`)</small></capp-button>
                         </capp-toggles>`;
                     
 

package/server/schemas/list.js

@@ -43,8 +43,20 @@ var schema = {
             let itemObj = $J.get(item);
             return _joe.renderFieldListItem(itemObj,'',itemObj.itemType);
         }).join('')
-        +'</joe-content-section>'
-        +((list.description &&`<joe-content-section>${list.description}</joe-content-section>`) ||'')
+        +'</joe-content-section>';
+        if(list.custom_items && list.custom_items.length){
+            h+=`<joe-content-section class="no-padding">${
+            list.custom_items.map(ci=>{
+                var done = (ci.sub_complete)?'joe-strike':'';
+                return`<joe-list-item class="custom-item"><joe-subtext>${ci.type ||''}</joe-subtext>
+                <joe-title class="${done}">${ci.name}</joe-title></joe-list-item>`;
+            }).join(' ')
+        }</joe-content-section>` ;
+        }
+
+
+        
+        h+=((list.description &&`<joe-content-section>${list.description}</joe-content-section>`) ||'')
         +`<joe-subtext class="fright">created <b>${_joe.Utils.toDateString(list.created)}</b></joe-subtext>`;
 
         return h;
@@ -157,7 +169,7 @@ var schema = {
     ];
     },
     idprop : "_id",
-    sorter:['date','name','list_type','!joeUpdated','created'],
+    sorter:['!joeUpdated','date','name','list_type','created'],
     report:{
         name:'List',
         info:'basic list view',