Make shit better

diff --git a/Classes/class-plugin-git.php b/Classes/class-plugin-git.php
index f88c7ea8fea6255801dd83df51d116d18936505e..8d34c5015979dbf0d3ea073bdfd21599211fe742 100644 (file)
--- a/Classes/class-plugin-git.php
+++ b/Classes/class-plugin-git.php
@@ -92,7 +92,7 @@
                         <div class="media-body">
                             <div style="position:relative;float:inline-end"><?php echo $this->ifInstalledLabel($p->name); ?></div>
                             <h4 class="mb-0 mt-0"><?php echo $p->title ?></h4>
-                            <small>By <a href="<?php echo "mailto:$p->email" ?>" target="_blank"><?php echo $p->author ?></a></small>
+                            <small>By <a href="<?php echo "mailto:$p->contact" ?>" target="_blank"><?php echo $p->author ?></a></small>
                         </div>
                     </div>
                 </div>
@@ -100,7 +100,7 @@
                 <!-- Card body -->
                 <div class="card-body">
                     <h6 class="card-title"><?php echo $p->title ?> <small><code>v<?php echo $p->version ?></code></small></h6>
-                    <p class="card-text"><?php echo $p->description ?> </p>
+                    <p class="card-text"><?php echo $p->description ?><br><br>  </p>
                 </div>
 
                 <!-- Card footer -->

diff --git a/settings/add-plugin.php b/settings/add-plugin.php
index adc001696b1d7007365cbb506633b7ccef8ffbf6..cf55227b8745951718a30fc0da6e8ef3359b9cc7 100644 (file)
--- a/settings/add-plugin.php
+++ b/settings/add-plugin.php
@@ -87,11 +87,7 @@ $p = new PluginRepo();
                     {
                         install_button.innerHTML = (inst == "uninstall") ? "Install" : "Uninstall";
                         install_button.classList.replace('btn-secondary', (inst == "uninstall") ? 'btn-primary' : 'btn-outline-danger');
-                        let icomplete = bsModal(((inst == "uninstall") ? "Uninstall" : "Install") + " Plugin", response.success,"<div id=\""+name+"closebtn\" class=\"btn btn-danger\">Close</div>", null, true, true, false);
-                        let closebtn = document.getElementById(name+"closebtn");
-                        closebtn.addEventListener('click', e => {
-                            location.reload();
-                        });
+                        setTimeout(() => { location.reload() }, 500);
                     }
                 }
                 else
@@ -100,11 +96,7 @@ $p = new PluginRepo();
                     {
                         install_button.innerHTML = (inst == "uninstall") ? "Uninstall" : "Install";
                         install_button.classList.replace('btn-secondary', (inst == "uninstall") ? 'btn-outline-danger' : 'btn-primary');
-                        let icomplete = bsModal(((inst == "uninstall") ? "Uninstall" : "Install") + " Plugin", response.error,"", null, false, true);
-                        let closebtn = document.getElementById(name+"closebtn");
-                        closebtn.addEventListener('click', e => {
-                            location.reload();
-                        });
+                        setTimeout(() => { location.reload() }, 500);
                     }
                 }
             }
@@ -127,15 +119,50 @@ $p = new PluginRepo();
                     const modal = bsModal(
                         "<i>Information about " + data.list[i].title + "</i>", // title
                         "<div class=\"" + data.list[i].name + "_screenshots\"><i class=\"fa fa-spinner\" aria-hidden=\"true\"></i></div><div class=\"" + data.list[i].name + "_description\"><i class=\"fa fa-spinner\" aria-hidden=\"true\"></i></div>",
-                        "<div id=\""+modname+"closebtn\" class=\"btn btn-danger\">Close</div>", null, true, true, false
+                        "<div id=\""+modname+"closebtn\" class=\"btn btn-danger\">Close</div>", "lg", true, true, true
                     );
                     let modalclose = document.getElementById(modal);
                     modalclose.addEventListener('click', (e) => {
                         $("#"+modal).modal('hide');
                     });
-                    console.log(modal + '-body');
                     boobs = document.getElementById(modal + '-body');
-                    boobs.innerHTML = data.list[i].description;
+                    boobs.innerHTML = "";
+                    if (data.list[i].screenshot.length)
+                    {
+                        boobs.innerHTML += ` <div style="padding-left: 0px;  padding-right: 0px;">
+                                            <img src="` + (data.list[i].screenshot[0] ?? "") + `" class="screenshot img-fluid" alt="` + data.list[i].screenshot[1] + ` style="max-width: 100%; height:auto">
+                                        </div>`;
+                    }
+                    boobs.innerHTML += "<p class=\"alert alert-primary mt-2\"><i><b>Description:</i></b><br>" + atob(data.list[i].readme.replace(["\n",""],["<br>","<br>"])) + "</p>";
+                    boobs.innerHTML +=  `<div class="alert alert-dark">
+                                        <table class="table">
+                                            <tr>
+                                                    <th scope="row">Title</th>
+                                                    <td>`+data.list[i].title+`</td>
+                                                </tr>
+                                                <tr>
+                                                    <th scope="row">Description</th>
+                                                    <td>`+data.list[i].description+`</td>
+                                                </tr>
+                                                <tr>
+                                                    <th scope="row">Version</th>
+                                                    <td>`+data.list[i].version+`</td>
+                                                </tr>
+                                                <tr>
+                                                    <th scope="row">Author</th>
+                                                    <td>`+data.list[i].author+`</td>
+                                                </tr>
+                                                <tr>
+                                                    <th scope="row">Min Version Required</th>
+                                                    <td>`+data.list[i].minver+`</td>
+                                                </tr>
+                                                <tr>
+                                                    <th scope="row">Max Version</th>
+                                                    <td>`+data.list[i].maxver+`</td>
+                                                </tr>
+                                                
+                                            </table></small>
+                                        </div>`;
                 }
             }
         })