2.3.0: minor updates

acaldero · Jun 25, 2023 · bc36f72 · bc36f72
1 parent 4b3b8a2
commit bc36f72
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 30 deletions.
diff --git a/external/bootstrap-tokenfield.js b/external/bootstrap-tokenfield.js
@@ -233,7 +233,7 @@
       // Bail out if there if attributes are empty or event was defaultPrevented
       if (!createEvent.attrs || createEvent.isDefaultPrevented()) return
 
-      var $token = $('<div class="token" />')
+      var $token = $('<div class="token bg-black text-white" />')
             .append('<span class="token-label" />')
             .append('<a href="#" class="btn-close mx-2" tabindex="-1">&times;</a>')
             .data('attrs', attrs)

diff --git a/external/css-tricks.css b/external/css-tricks.css
@@ -96,7 +96,7 @@
         transition: none !important;
 }
 
-    .tokenfield .token .token-label {
+.tokenfield .token .token-label {
         max-width: none!important;
 }
 

diff --git a/images/author_juanbanpar.png b/images/author_juanbanpar.png
diff --git a/sim_core/sim_adt_core.js b/sim_core/sim_adt_core.js
@@ -141,6 +141,21 @@
 					github:  { name: "github", faclass: "fab fa-github",
 						   href:"https://github.com/saulam/" }
 				     }
+			  },
+			  {
+			    c_id:    "collapse-author-5",
+			    i_src:   "images/author_juanbanpar.png",
+			    i_alt:   "Juan Banga Pardo",
+			    a_id:    "juanbanpar",
+			    a_name:  "Juan Banga Pardo",
+			    socials: {
+					lkin:    { name: "linkedin", faclass: "fab fa-linkedin",
+						   href:"https://www.linkedin.com/in/juanbangapardo/" },
+					rgate:   { name: "r-gate", faclass: "fab fa-researchgate",
+						   href:"" },
+					github:  { name: "github", faclass: "fab fa-github",
+						   href:"https://github.com/juanbanpar/" }
+				     }
 			  }
                         ] ;
 

diff --git a/sim_hw/sim_hw_ep/sim_hw_cpu.js b/sim_hw/sim_hw_ep/sim_hw_cpu.js
@@ -590,12 +590,12 @@
 	 sim.ep.signals["TA"]  = { name: "TA",  visible: true, type: "L", value: 0, default_value:0, nbits: "1",
 			           behavior: ["NOP", "MV BUS_AB REG_MAR; MOVE_BITSE A1A0 0 2 BUS_AB 0; FIRE_IFCHANGED A1A0 A1A0"],
 			           fire_name: ['svg_p:text3091'],
-			           draw_data: [['svg_p:path3089', 'svg_p:path3597', 'svg_p:path3513', 'svg_p:path3601', 'svg_p:path3601-2', 'svg_p:path3187', 'svg_p:path3087', 'svg_p:path2995','svg_p:path3535']],
+			           draw_data: [['svg_p:path3083','svg_p:path3089', 'svg_p:path3597', 'svg_p:path3513', 'svg_p:path3601', 'svg_p:path3601-2', 'svg_p:path3187', 'svg_p:path3087', 'svg_p:path2995','svg_p:path3535']],
 			           draw_name: [['svg_p:path3085']] };
 	 sim.ep.signals["TD"]  = { name: "TD",  visible: true, type: "L", value: 0, default_value:0, nbits: "1",
 			           behavior: ["NOP; CHECK_RTD", "MV BUS_DB BS_TD; MOVE_BITSE A1A0 0 2 BUS_AB 0; FIRE_IFCHANGED A1A0 A1A0; CHECK_RTD"],
 			           fire_name: ['svg_p:text3103'],
-			           draw_data: [['svg_p:path3101','svg_p:path3587','svg_p:path3515','svg_p:path3071','svg_p:path3419','svg_p:path3099','svg_p:path3097','svg_p:path3559-5','svg_p:path3419-1-0','svg_p:path3583','svg_p:path3419-1','svg_p:path3491','svg_p:path3641','svg_p:path3541']],
+			           draw_data: [['svg_p:path3093','svg_p:path3101','svg_p:path3587','svg_p:path3515','svg_p:path3071','svg_p:path3419','svg_p:path3099','svg_p:path3097','svg_p:path3559-5','svg_p:path3419-1-0','svg_p:path3583','svg_p:path3419-1','svg_p:path3491','svg_p:path3641','svg_p:path3541']],
 			           draw_name: [['svg_p:path3095']] };
 
 	 sim.ep.signals["T1"]  = { name: "T1",  visible: true, type: "L", value: 0, default_value:0, nbits: "1",

diff --git a/wepsim_web/wepsim_uielto_about.js b/wepsim_web/wepsim_uielto_about.js
@@ -59,23 +59,24 @@
 			      "" +
 			      "	<div class='form-group'>" +
 			      "	   <label for='about_authors' class='text-secondary'>Authors:</label>" +
-			      "	   <div id='about_" + this.name_str + "'>" +
+			      "	   <div id='about_" + this.name_str + "' " +
+                              "         style='overflow:auto; -webkit-overflow-scrolling:touch;' >"+
 			      "	     <ul>" +
                               "      <li>Felix Garcia Carballeira</li>" +
                               "      <li>Javier Prieto Cepeda</li>" +
                               "      <li>Saul Alonso Monsalve</li>" +
+                              "      <li>Juan Banga Pardo</li>" +
                               "      <li>Alejandro Calderon Mateos</li>" +
 			      "	     </ul>" +
 			      "	   </div>" +
 			      "	</div>" +
 			      "" +
 			      '    <div class="mx-auto mt-3 bg-white rounded">' +
 			      '       <div class="row mx-auto">' +
-			      '          <span class="col me-auto"><img alt="ARCOS group logo" src="images/arcos.svg" style="height:30pt" class="img-fluid rounded m-0 p-1" /></span>' +
+			      '          <span class="col me-auto"><img alt="ARCOS group logo" src="images/arcos.svg" class="img-fluid rounded m-0 p-1" /></span>' +
 			      '          <span class="col ms-auto"><img alt="Computer Science and Engineering Departament logo" src="images/dptoinf.png" class="img-fluid rounded m-0 p-0" /></span>' +
 			      '       </div>' +
 			      '    </div>' +
-			      '    <br/>' +
 			      "" +
 			      "</form>" ;
 
@@ -92,12 +93,12 @@
 
 		    // html holder
 		    var o1 = '<div id="authors_' + this.name_str + '" ' +
-                             '     class="card-desk row mx-auto" style="max-width:512px;">' +
-			     '<div v-for="author in authors" class="card bg-tertiary text-center col-3 p-0">' +
+                             '     class="card-desk row mx-auto">' +
+			     '<div v-for="author in authors" class="card bg-tertiary text-center col p-0">' +
 			     '  <img class="card-img-top img-fluid shadow no-dark-mode" ' +
                              '       v-bind:id="authors.c_id"' +
                              '       v-bind:src="author.i_src" v-bind:alt="author.i_alt" />' +
-			     '  <div class="card-body p-3">' +
+			     '  <div class="card-body pt-2 pb-1 px-0">' +
                              '       <a class="btn p-0 text-primary d-md-none text-vertical-lr "' +
                              '          v-bind:id="author.a_id">{{ author.i_alt }}</a>' +
                              '       <a class="btn p-0 text-primary d-none d-md-block"' +

diff --git a/wepsim_web/wepsim_uielto_flash_asm.js b/wepsim_web/wepsim_uielto_flash_asm.js
@@ -97,7 +97,7 @@
                         '       role="tabpanel" aria-labelledby="nav-flash-tab" tabindex="0">' +
                         '' +
                                "<div class='row m-0'>" +
-                               "<div class='col-6 p-2'>" +
+                               "<div class='col-xs-12 col-md-6 p-2'>" +
                                 '' +
 				'<div class="py-2">' +
 				'<label for="div_url">(1) Set the URL where gateway.py is listening:</label><br>' +
@@ -149,10 +149,10 @@
 				'</div>' +
                                 '' +
                                "</div>" +
-                               "<div class='col-6 p-2'>" +
+                               "<div class='col-xs-12 col-md-6 p-2'>" +
                                 '' +
 				'<label for="div_info">(5) Output:</label><br>' +
-				'<textarea class="form-control border border-black"' +
+				'<textarea class="form-control border border-secondary"' +
 				'	  id="div_info" name="div_info"' +
 				'	  rows="10" cols="50">' +
 				'</textarea>' +

diff --git a/wepsim_web/wepsim_uiscreen_main.js b/wepsim_web/wepsim_uiscreen_main.js
@@ -80,20 +80,22 @@
                    // load HTML
                    this.innerHTML = o1 ;
 
-	           // basic initialization of wepsim first time...
-		   if ("connectedCallback" == event_name)
-		   {
-	               simcore_init(true) ;
-	               simcore_welcome() ;
-	               upgrade_cfg() ;
-		   }
-
                    // (if empty HTML then return)
 		   if ('' == o1) {
 	               this.render_skel() ;
                        return ;
 		   }
 
+                   // initialization only on "connectedCallback"
+		   if ("connectedCallback" != event_name) {
+                       return ;
+		   }
+
+	           // basic initialization of wepsim first time...
+	           simcore_init(true) ;
+	           simcore_welcome() ;
+	           upgrade_cfg() ;
+
 	           // ...and full initialization after jquery-ready
 	           $(document).ready(function()
 	           {

diff --git a/wepsim_web/wepsim_web_pwa.js b/wepsim_web/wepsim_web_pwa.js
@@ -23,7 +23,7 @@
  * cache versioning
  */
 
-var cacheName = 'v221a_static';
+var cacheName = 'v230a_static';
 
 
 /*

diff --git a/wepsim_web/wepsim_web_ui_dialogs.js b/wepsim_web/wepsim_web_ui_dialogs.js
@@ -344,7 +344,7 @@
 				           }
 			     }
 	             },
-            size:    '',
+            size:    'large',
             onshow:  function() {
 			 $('div.wsversion').replaceWith(get_cfg('version')) ;
 

diff --git a/ws_dist/examples/hardware/ep/hw_def.json b/ws_dist/examples/hardware/ep/hw_def.json
diff --git a/ws_dist/images/author_juanbanpar.png b/ws_dist/images/author_juanbanpar.png
diff --git a/ws_dist/min.external.css b/ws_dist/min.external.css
diff --git a/ws_dist/min.external.js b/ws_dist/min.external.js
diff --git a/ws_dist/min.sim_all.js b/ws_dist/min.sim_all.js
diff --git a/ws_dist/min.wepsim_node.js b/ws_dist/min.wepsim_node.js
diff --git a/ws_dist/min.wepsim_web.js b/ws_dist/min.wepsim_web.js
diff --git a/ws_dist/min.wepsim_web_pwa.js b/ws_dist/min.wepsim_web_pwa.js
@@ -23,7 +23,7 @@
  * cache versioning
  */
 
-var cacheName = 'v221a_static';
+var cacheName = 'v230a_static';
 
 
 /*