Merge pull request #223 from datasci4health/development

Development
harena-lab · Sep 3, 2020 · bcf187a · bcf187a
2 parents 7b48e78 + fefe46e
commit bcf187a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 22 deletions.
diff --git a/src/adonisjs/public/author/js/create.js b/src/adonisjs/public/author/js/create.js
@@ -44,8 +44,8 @@ class TemplateManager {
 
   TemplateManager.templateBox =
 `            <div class="d-flex h-75 flex-column create-template-author-container">
-              <div class=" h-75">
-                <div class="draft-case-image text-center">
+              <div class="h-75">
+                <div class="h-50 draft-case-image text-center">
                    <img src="[icon]" class="home-author-image">
                 </div>
                 <div class="draft-case-title text-center">[title]</div>

diff --git a/src/adonisjs/public/dccs/edit/inplace-text-editor.js b/src/adonisjs/public/dccs/edit/inplace-text-editor.js
@@ -139,7 +139,9 @@ class EditDCCText extends EditDCC {
       this._elementWrapperRect.top - this._containerRect.top)
     editor.style.width = this._transformRelativeX(this._elementWrapperRect.width)
     editor.style.height =
-         this._transformRelativeY(this._elementWrapperRect.height)
+        this._transformRelativeY(
+          (this._elementWrapperRect.height < EditDCCText.minHeight) ? EditDCCText.minHeight : this._elementWrapperRect.height
+        )
     if (this._svgDraw) {
       editor.innerHTML =
             EditDCCText.editorTemplate.svg
@@ -653,22 +655,7 @@ class EditDCCText extends EditDCC {
 (function () {
 /* icons from Font Awesome, license: https://fontawesome.com/license */
 
-  // image https://fontawesome.com/icons/link?style=solid
-/*
-  EditDCCText.buttonLinkSVG =
-`<svg viewBox="0 0 512 512">
-<path fill="currentColor" d="M326.612 185.391c59.747 59.809 58.927 155.698.36 214.59-.11.12-.24.25-.36.37l-67.2 67.2c-59.27 59.27-155.699 59.262-214.96 0-59.27-59.26-59.27-155.7 0-214.96l37.106-37.106c9.84-9.84 26.786-3.3 27.294 10.606.648 17.722 3.826 35.527 9.69 52.721 1.986 5.822.567 12.262-3.783 16.612l-13.087 13.087c-28.026 28.026-28.905 73.66-1.155 101.96 28.024 28.579 74.086 28.749 102.325.51l67.2-67.19c28.191-28.191 28.073-73.757 0-101.83-3.701-3.694-7.429-6.564-10.341-8.569a16.037 16.037 0 0 1-6.947-12.606c-.396-10.567 3.348-21.456 11.698-29.806l21.054-21.055c5.521-5.521 14.182-6.199 20.584-1.731a152.482 152.482 0 0 1 20.522 17.197zM467.547 44.449c-59.261-59.262-155.69-59.27-214.96 0l-67.2 67.2c-.12.12-.25.25-.36.37-58.566 58.892-59.387 154.781.36 214.59a152.454 152.454 0 0 0 20.521 17.196c6.402 4.468 15.064 3.789 20.584-1.731l21.054-21.055c8.35-8.35 12.094-19.239 11.698-29.806a16.037 16.037 0 0 0-6.947-12.606c-2.912-2.005-6.64-4.875-10.341-8.569-28.073-28.073-28.191-73.639 0-101.83l67.2-67.19c28.239-28.239 74.3-28.069 102.325.51 27.75 28.3 26.872 73.934-1.155 101.96l-13.087 13.087c-4.35 4.35-5.769 10.79-3.783 16.612 5.864 17.194 9.042 34.999 9.69 52.721.509 13.906 17.454 20.446 27.294 10.606l37.106-37.106c59.271-59.259 59.271-155.699.001-214.959z">
-</path></svg>`
-*/
-
-
-  // image https://fontawesome.com/icons/image?style=regular
-/*
-  EditDCCText.buttonImageSVG =
-`<svg viewBox="0 0 512 512">
-<path fill="currentColor" d="M464 64H48C21.49 64 0 85.49 0 112v288c0 26.51 21.49 48 48 48h416c26.51 0 48-21.49 48-48V112c0-26.51-21.49-48-48-48zm-6 336H54a6 6 0 0 1-6-6V118a6 6 0 0 1 6-6h404a6 6 0 0 1 6 6v276a6 6 0 0 1-6 6zM128 152c-22.091 0-40 17.909-40 40s17.909 40 40 40 40-17.909 40-40-17.909-40-40-40zM96 352h320v-80l-87.515-87.515c-4.686-4.686-12.284-4.686-16.971 0L192 304l-39.515-39.515c-4.686-4.686-12.284-4.686-16.971 0L96 304v48z">
-</path></svg>`
-*/
+  EditDCCText.minHeight = 300
 
   // comment-alt https://fontawesome.com/icons/comment-alt?style=regular
   EditDCCText.buttonAnnotationSVG =

diff --git a/src/adonisjs/public/infra/css/common-author.css b/src/adonisjs/public/infra/css/common-author.css
@@ -62,7 +62,8 @@ nav.navbar {
 }
 
 .create-template-author-container{
-  width: 250px !important;
+  width: 200px !important;
+  min-width: 200px !important;
   margin: 10px;
   background-color: #ffffff;
   border-color: #808080;

diff --git a/src/adonisjs/resources/views/layout/partials/settings-modal.edge b/src/adonisjs/resources/views/layout/partials/settings-modal.edge
@@ -31,10 +31,10 @@
             <input type="date" class="form-control" id="originalDate" name="originalDate" value="{{caseOriginalDate}}">
             {{-- <small id="keywords-help" class="form-text text-muted">Inform the date of case creation on Jacinto Moodle</small> --}}
           </div>
-          <div class="form-group">
+<!--          <div class="form-group">
             <label for="institution">Institution</label>
           <input type="text" class="form-control" id="institution" name="institution" value="{{caseInstitution}}" placeholder="Enter your institution">
-          </div>
+        </div> -->
           <div class="form-group">
             <label for="keywords">Domain</label>
             <input type="text" class="form-control" id="domain" name="domain" value="{{caseDomain}}" placeholder="Inform the case domain">