combine ui for assets

support/client/lib/vwf/view/editor-new.js

@@ -277,12 +277,12 @@ define([
                                 $cell: true,
                                 $type: "h3",
                                 class: "mdc-typography--title",
-                                $text:"3D Assets" 
+                                $text:"Assets" 
                              
                             },
                             widgets.textField({
                                 id:"asset3dsrc",
-                                value:"URL to asset source",
+                                value:"Enter URL to asset source",
                                 funconchange: function(e){
                                     console.log(this.value)
                                 }
@@ -297,99 +297,68 @@ define([
                                         $type: "ul",
                                         class: "mdc-grid-list__tiles",
                                         $components: [
-                                            widgets.buttonStroked(
+                                            widgets.buttonSimple(
                                                 {
-                                                    label: "GLTF",
+                                                    label: "Image",
                                                     onclick: function(e){
                                                     }
                                                 }
                                             ),
-                                            widgets.buttonStroked(
+                                            widgets.buttonSimple(
                                                 {
-                                                    label: "DAE",
+                                                    label: "Sound",
                                                     onclick: function(e){
-                                                        let srcEl = document.querySelector('#asset3dsrc');
-                                                        let avatarID = 'avatar-' + vwf.moniker_;
-                                                        if(srcEl.value.includes('.dae'))
-                                                        vwf_view.kernel.callMethod(vwf.application(), "createModelDAE", [srcEl.value, avatarID])
-
                                                     }
                                                 }
                                             ),
-                                            widgets.buttonStroked(
+                                            widgets.buttonSimple(
                                                 {
-                                                    label: "OBJ",
+                                                    label: "Video",
                                                     onclick: function(e){
                                                     }
                                                 }
                                             ),
-                                            widgets.buttonStroked(
+                                            widgets.buttonSimple(
                                                 {
                                                     label: "MTL",
                                                     onclick: function(e){
                                                     }
                                                 }
                                             ),
-                                        
-                                        ]
-                                    }
-                                ]
-                            }, 
-                            //widgets.divider,
-                            {
-                                $cell: true,
-                                $type: "h3",
-                                class: "mdc-typography--title",
-                                $text:"2D Assets / Sound" 
-                             
-                            },
-                            widgets.textField({
-                                id:"asset2dsrc",
-                                value:"URL to asset source",
-                                funconchange: function(e){
-                                    console.log(this.value)
-                                }
-                            }),
-                            {
-                                $cell: true,
-                                $type: "div",
-                                class: "mdc-grid-list",
-                                $components: [
-                                    {
-                                        $cell: true,
-                                        $type: "ul",
-                                        class: "mdc-grid-list__tiles",
-                                        $components: [
-                                            widgets.buttonStroked(
+                                            widgets.buttonSimple(
                                                 {
-                                                    label: "Image",
+                                                    label: "GLTF",
                                                     onclick: function(e){
                                                     }
                                                 }
                                             ),
-                                            widgets.buttonStroked(
+                                            widgets.buttonSimple(
                                                 {
-                                                    label: "Sound",
+                                                    label: "DAE",
                                                     onclick: function(e){
+                                                        let srcEl = document.querySelector('#asset3dsrc');
+                                                        let avatarID = 'avatar-' + vwf.moniker_;
+                                                        if(srcEl.value.includes('.dae'))
+                                                        vwf_view.kernel.callMethod(vwf.application(), "createModelDAE", [srcEl.value, avatarID])
+
                                                     }
                                                 }
                                             ),
-                                            widgets.buttonStroked(
+                                            widgets.buttonSimple(
                                                 {
-                                                    label: "Video",
+                                                    label: "OBJ",
                                                     onclick: function(e){
                                                     }
                                                 }
                                             )
                                            
+                                            
                                         
                                         ]
                                     }
                                 ]
-                            },
-                            {
-                                $type:"div"
-                            },
+                            }, 
+
                              //widgets.divider,
                             {
                                 $cell: true,

support/client/lib/vwf/view/widgets.js

@@ -186,6 +186,16 @@ define(function () {
             }
         }
 
+        buttonSimple(obj){
+            return {
+                $cell: true,
+                $type: "button",
+                class: "mdc-button mdc-ripple-upgraded",
+                $text: obj.label,
+                onclick: obj.onclick
+            }
+        }
+
         sliderDiscrete(obj) {
             return {
                 $cell: true,