diff --git a/build/index.php b/build/index.php index 397c46e..26e4d19 100644 --- a/build/index.php +++ b/build/index.php @@ -245,7 +245,7 @@ input[type=button], input[type=submit] { cursor: pointer; } .preview img { max-width: 100%; } .image-controls ul { list-style-type: none; margin: 5px; padding: 5px; } .image-controls li { display: inline-block; margin: 5px; padding: 5px; } - +.link-display { margin-left: 0.5rem; } .printable { padding: 2rem; } @@ -254,8 +254,9 @@ h1 { text-align: center; } .logo { max-width: 4rem; max-height: 4rem; vertical-align: middle; } main:not(.printable) { padding: 2rem; background: #faf8fb; box-shadow: 0 0.1rem 1rem 0.3rem rgba(50, 50, 50, 0.5); } -label { display: inline-block; min-width: 7rem; } -input[type=text], input[type=password], textarea { margin: 0.5rem 0.8rem; padding: 0.5rem 0.8rem; background: #d5cbf9; border: 0; border-radius: 0.3rem; font-size: 1rem; color: #442772; } +label:not(.link-display-label) { display: inline-block; min-width: 7rem; } +input[type=text]:not(.link-display), input[type=password], textarea { margin: 0.5rem 0.8rem; } +input[type=text], input[type=password], textarea { padding: 0.5rem 0.8rem; background: #d5cbf9; border: 0; border-radius: 0.3rem; font-size: 1rem; color: #442772; } textarea { width: calc(100% - 2rem); min-height: 35rem; font-size: 1.25rem; } textarea ~ input[type=submit] { width: calc(100% - 0.3rem); margin: 0.5rem 0.8rem; padding: 0.5rem; font-weight: bolder; } @@ -1460,6 +1461,7 @@ register_module([ // We are looking at a page that is paired with an uploaded file $filepath = $pageindex->{$env->page}->uploadedfilepath; $mime_type = $pageindex->{$env->page}->uploadedfilemime; + $image_link = "//" . $_SERVER["SERVER_NAME"] . dirname($_SERVER["SCRIPT_NAME"]) . $filepath; $preview_sizes = [ 256, 512, 768, 1024, 1536 ]; $preview_html = "
@@ -1469,7 +1471,8 @@ register_module([
  • Other Sizes: "; foreach($preview_sizes as $size) $preview_html .= "$size" . "px "; - $preview_html .= "
  • + $preview_html .= " +
  • File Information

    diff --git a/module_index.json b/module_index.json index b1938a3..9d231d7 100644 --- a/module_index.json +++ b/module_index.json @@ -50,7 +50,7 @@ "author": "Starbeamrainbowlabs", "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File:' prefix.", "id": "feature-upload", - "lastupdate": 1445693273, + "lastupdate": 1445716955, "optional": false }, { diff --git a/modules/feature-upload.php b/modules/feature-upload.php index 2f845ee..d24c9c8 100644 --- a/modules/feature-upload.php +++ b/modules/feature-upload.php @@ -219,6 +219,7 @@ register_module([ // We are looking at a page that is paired with an uploaded file $filepath = $pageindex->{$env->page}->uploadedfilepath; $mime_type = $pageindex->{$env->page}->uploadedfilemime; + $image_link = "//" . $_SERVER["SERVER_NAME"] . dirname($_SERVER["SCRIPT_NAME"]) . $filepath; $preview_sizes = [ 256, 512, 768, 1024, 1536 ]; $preview_html = "
    @@ -228,7 +229,8 @@ register_module([
  • Other Sizes: "; foreach($preview_sizes as $size) $preview_html .= "$size" . "px "; - $preview_html .= "
  • + $preview_html .= " +
  • File Information

    Name" . str_replace("File/", "", $filepath) . "
    diff --git a/settings.fragment.php b/settings.fragment.php index 332abbb..f149876 100644 --- a/settings.fragment.php +++ b/settings.fragment.php @@ -242,7 +242,7 @@ input[type=button], input[type=submit] { cursor: pointer; } .preview img { max-width: 100%; } .image-controls ul { list-style-type: none; margin: 5px; padding: 5px; } .image-controls li { display: inline-block; margin: 5px; padding: 5px; } - +.link-display { margin-left: 0.5rem; } .printable { padding: 2rem; } @@ -251,8 +251,9 @@ h1 { text-align: center; } .logo { max-width: 4rem; max-height: 4rem; vertical-align: middle; } main:not(.printable) { padding: 2rem; background: #faf8fb; box-shadow: 0 0.1rem 1rem 0.3rem rgba(50, 50, 50, 0.5); } -label { display: inline-block; min-width: 7rem; } -input[type=text], input[type=password], textarea { margin: 0.5rem 0.8rem; padding: 0.5rem 0.8rem; background: #d5cbf9; border: 0; border-radius: 0.3rem; font-size: 1rem; color: #442772; } +label:not(.link-display-label) { display: inline-block; min-width: 7rem; } +input[type=text]:not(.link-display), input[type=password], textarea { margin: 0.5rem 0.8rem; } +input[type=text], input[type=password], textarea { padding: 0.5rem 0.8rem; background: #d5cbf9; border: 0; border-radius: 0.3rem; font-size: 1rem; color: #442772; } textarea { width: calc(100% - 2rem); min-height: 35rem; font-size: 1.25rem; } textarea ~ input[type=submit] { width: calc(100% - 0.3rem); margin: 0.5rem 0.8rem; padding: 0.5rem; font-weight: bolder; }
    Name" . str_replace("File/", "", $filepath) . "