From 7d467b93e7cbfbaab876bf8cb77f783860dd1939 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Fri, 7 Apr 2017 15:14:02 -0400 Subject: [PATCH] Improving the layout of the Files tab --- css/admin.css | 21 ++ js/imageUpload/imageUpload.css | 4 +- views/admin/member/memberInfo.html | 50 ++--- .../admin/member/memberInfo/editCategory.html | 16 +- views/admin/member/memberInfo/editFiles.html | 204 +++++++++--------- 5 files changed, 158 insertions(+), 137 deletions(-) diff --git a/css/admin.css b/css/admin.css index 81658ca1..bc384a84 100644 --- a/css/admin.css +++ b/css/admin.css @@ -3,6 +3,9 @@ Gaslight Media Members Database Admin Styles */ +.wp-admin input[type="file"] { + white-space: normal; +} input, select, .button { max-width: 100%; } @@ -399,6 +402,14 @@ td.glm-nowrap { background-color: #eee; font-size: .8em; } +.glm-galleryFiles .glm-galleryContainer a { + display: block; + margin-top: 10px; + word-wrap: break-word; +} +.glm-galleryFiles .glm-galleryContainer { + height: 5em; +} .glm-galleryContainer { clear: both; @@ -417,6 +428,12 @@ td.glm-nowrap { font-size: 12px; padding: 4px 6px; } + .glm-galleryFiles .glm-galleryContainer { + height: 9em; + } + .glm-galleryFiles .glm-galleryContainer > div { + margin-bottom: 7px; + } } .glm-galleryContainerFlexible { @@ -492,6 +509,10 @@ td.glm-nowrap { width: 100%; resize: none; } +.glm-galleryImageData input[type="checkbox"], +.glm-galleryImageData input[type="radio"] { + margin-top: -1px; +} .glm-ol-selected { font-weight: bold; diff --git a/js/imageUpload/imageUpload.css b/js/imageUpload/imageUpload.css index d82fe33d..a512d6bf 100644 --- a/js/imageUpload/imageUpload.css +++ b/js/imageUpload/imageUpload.css @@ -192,14 +192,14 @@ border: 2px solid #000 important; background-color: #fff; } -.glm-fileData { +/*.glm-fileData { width: 70%; float: right; } .glm-file { width: 30%; float: left; -} +}*/ .glm-imageUploadStatus { position: absolute; diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html index 0b867d61..c32c2b48 100644 --- a/views/admin/member/memberInfo.html +++ b/views/admin/member/memberInfo.html @@ -106,7 +106,7 @@ Images/Media - + Files {if $memberUpdated}{$terms.term_member_cap} Profile Updated{/if} {if $memberUpdateError}{$terms.term_member_cap} Profile Update Error{/if} @@ -143,30 +143,30 @@
-

{$terms.term_member_cap} Name:

{$member.name}
-

{$terms.term_member_cap} Type:

{$member.member_type.name}
-

Access:

{$member.access.name}
-

Created:

{$memberInfo.fieldData.create_time.datetime}
-

Last Updated:

{$memberInfo.fieldData.modify_time.datetime}
-

{$terms.term_member_cap} Info Status:

{$memberInfo.fieldData.status.name}
-

Reference Name:

{$memberInfo.fieldData.reference_name}
+

{$terms.term_member_cap} Name:

{$member.name}
+

{$terms.term_member_cap} Type:

{$member.member_type.name}
+

Access:

{$member.access.name}
+

Created:

{$memberInfo.fieldData.create_time.datetime}
+

Last Updated:

{$memberInfo.fieldData.modify_time.datetime}
+

{$terms.term_member_cap} Info Status:

{$memberInfo.fieldData.status.name}
+

Reference Name:

{$memberInfo.fieldData.reference_name}
-   - +
 
+

Descriptions

- +
-

Description:

{$memberInfo.fieldData.descr|escape:quotes}
-

Short Description:

{$memberInfo.fieldData.short_descr}
+

Description:

{$memberInfo.fieldData.descr|escape:quotes}
+

Short Description:

{$memberInfo.fieldData.short_descr}
-   - +
 
+

Other Information

- +

Amenities

- +
{if isset($memberInfo.fieldData.amenities) && $memberInfo.fieldData.amenities} {foreach from=$memberInfo.fieldData.amenities item=c} @@ -176,12 +176,12 @@
{/foreach} {/if} - +
-

Notes:

{$memberInfo.fieldData.notes}
+

Notes:

{$memberInfo.fieldData.notes}

Image Gallery

- +
    {if $haveImageGallery} {foreach $imageGallery as $i} @@ -191,11 +191,11 @@

    Caption:

    - -
    +
    +

    Description:

    - +
@@ -207,8 +207,8 @@ {/foreach} {/if} -
- + +
{/if} diff --git a/views/admin/member/memberInfo/editCategory.html b/views/admin/member/memberInfo/editCategory.html index 259bd3ee..8efbadf4 100644 --- a/views/admin/member/memberInfo/editCategory.html +++ b/views/admin/member/memberInfo/editCategory.html @@ -71,7 +71,7 @@ {/foreach} {/if}
-
+
@@ -113,11 +113,11 @@
+ diff --git a/views/admin/member/memberInfo/editFiles.html b/views/admin/member/memberInfo/editFiles.html index 059200f0..c2cfb4c5 100644 --- a/views/admin/member/memberInfo/editFiles.html +++ b/views/admin/member/memberInfo/editFiles.html @@ -1,111 +1,111 @@ - - - - - -
Files - {if $memberInfoID} - -
- -
- -
+
+

Files

+ +
+
+
+ {if $memberInfoID} + +
+ +
+ +
- - Uploading File { thisFile } of { numbFiles } - - -
-
+ + Uploading File { thisFile } of { numbFiles } + +
+
+
+
- - -
- - - - - - -
Cancel Upload
Name: { fileName }
Type: { fileType }
Size: { fileSize }
Progress:
- +
+
+
Cancel Upload
+
Name:
{ fileName }
+
+
Type:
{ fileType }
+
Size:
{ fileSize }
+
Progress:
+
+ -
- -
+
+ +
- -
  • -
    - - - - - - -
    File Name: - - - -
    Delete:
    New Upload
    -
    + +
  • +
    + { file_name } +
    +
    +
    +

    File Name:

    +
    +
    +
    +
    +
    +

    Delete:

    +

    New Upload

    +
    + +
    +
    • + + +
    +
    +
    +
    Drag and drop new files here
    +
    HTML5 file drag-and-drop not supported by your browser.
    Use "Browse" button above to upload an file.
    +
    +
      + + {if $haveFiles} + {foreach $files as $i} + {if $i.file_name} +
    • +
      + {$i.name} +
      +
      +
      +

      File Name:

      +
      -
      - { file_name } +
      +
      +
      +

      Delete:

      -
      • - + +
    + {/if} + -
    -
    -
    -
    Drag and drop new files here
    -
    HTML5 file drag-and-drop not supported by your browser.
    Use "Browse" button above to upload an file.
    -
    -
      - - {if $haveFiles} - {foreach $files as $i} - {if $i.file_name} -
    • -
      - - - - - - -
      File Name: - - -
      Delete:
      - -
      -
      -
      - {$i.name} -
      + {/foreach} {/if} -
      • - - {/foreach} +
    + {else} + Note: Files may only be added to {$terms.term_member} profile records that have been created. + You are editing information to create a new record. +
    After you click "Add new {$terms.term_member}" below, you may come back here to add files. {/if} - - {else} - Note: Files may only be added to {$terms.term_member} profile records that have been created. - You are editing information to create a new record. -
    After you click "Add new {$terms.term_member}" below, you may come back here to add files. - {/if} -
    + + + + -- 2.17.1