Changeset 557

Timestamp:

Dec 23, 2015 11:22:00 PM (8 years ago)

Author:

anonymous

Message:

Changed form input widths from em to rem. Contingency for empty logMsg() file and line. Minor mm fix.

Location:

trunk

Files:

• bin/module_maker/module.cli.php (modified) (1 diff)
• css/admin2.inc.css (modified) (2 diffs)
• css/utilities.inc.css (modified) (1 diff)
• lib/App.inc.php (modified) (1 diff)

trunk/bin/module_maker/module.cli.php

@@ -233 +233 @@
 // -------------FILES-------------
 
-switch ($op) {
-case 'admin':
-    $skel_files['skel_admin_script'] = file_get_contents($skel_dir . '/admin.php');
-    $skel_files['skel_admin_list_template'] = file_get_contents($skel_dir . '/adm_list.ihtml');
-    $skel_files['skel_admin_form_template'] = file_get_contents($skel_dir . '/adm_form.ihtml');
-    break;
-
-case 'public':
-    $skel_files['skel_public_script'] = file_get_contents($skel_dir . '/public.php');
-    $skel_files['skel_public_list_template'] = file_get_contents($skel_dir . '/public_list.ihtml');
-    $skel_files['skel_public_detail_template'] = file_get_contents($skel_dir . '/public.ihtml');
-    break;
-}
+$skel_files = array();
+$skel_files['skel_admin_script'] = file_get_contents($skel_dir . '/admin.php');
+$skel_files['skel_admin_list_template'] = file_get_contents($skel_dir . '/adm_list.ihtml');
+$skel_files['skel_admin_form_template'] = file_get_contents($skel_dir . '/adm_form.ihtml');
+$skel_files['skel_public_script'] = file_get_contents($skel_dir . '/public.php');
+$skel_files['skel_public_list_template'] = file_get_contents($skel_dir . '/public_list.ihtml');
+$skel_files['skel_public_detail_template'] = file_get_contents($skel_dir . '/public.ihtml');
 
 

trunk/css/admin2.inc.css

@@ -367 +367 @@
 }
 
+.sc-form-row input + input {
+    margin-top: .5rem;
+    margin-bottom: .5rem;
+}
+
 input[type="submit"],
 input[type="button"] {
@@ -386 +391 @@
 select.sc-medium,
 label.sc-medium {
-    width: 21.25em;
+/* WFT? */
+/*    width: 21.25rem;*/
 }
 

trunk/css/utilities.inc.css

@@ -14 +14 @@
 input.sc-medium, textarea.sc-medium, select.sc-medium,
 input.sc-large, textarea.sc-large, select.sc-large,
-input.sc-full, textarea.sc-full, select.sc-full { margin: 0 0.5em 0 0; padding: 3px 0.25em; border-width: 1px; }
+input.sc-full, textarea.sc-full, select.sc-full {
+    margin: 0 0.5rem 0 0;
+    padding: 3px 0.25rem;
+    border-width: 1px;
+}
 
 /*
 The following widths are calculated using `width = (maxwidth - (1.2 * multiple)) / multiple`
-where width is the saught value, maxwidth is the width of a sc-large, and multiple is the number
+where width is the sought value, maxwidth is the width of a sc-large, and multiple is the number
 of times an element fits within maxwidth (i.e. sc-tiny has a multiple of 8).
 The values are dependent on the margin, padding, and border set above.
 */
-input.sc-tiny, textarea.sc-tiny, select.sc-tiny, label.sc-tiny          { width: 4.54em; }
-input.sc-small, textarea.sc-small, select.sc-small, label.sc-small      { width: 10.15em; }
-input.sc-medium, textarea.sc-medium, select.sc-medium, label.sc-medium  { width: 21.42em; }
-input.sc-large, textarea.sc-large, select.sc-large, label.sc-large      { width: 44em; }
+input.sc-tiny, textarea.sc-tiny, select.sc-tiny, label.sc-tiny          { width: 4.54rem; }
+input.sc-small, textarea.sc-small, select.sc-small, label.sc-small      { width: 10.15rem; }
+input.sc-medium, textarea.sc-medium, select.sc-medium, label.sc-medium  { width: 21.42rem; }
+input.sc-large, textarea.sc-large, select.sc-large, label.sc-large      { width: 44rem; }
 input.sc-full, textarea.sc-full, select.sc-full, label.sc-full          { width: 100%; }
 
-select.sc-small     { width: 10em; }
-select.sc-medium    { width: 20.5em; }
+select.sc-small     { width: 10rem; }
+select.sc-medium    { width: 20.5rem; }
 
-textarea.sc-twolines, select.sc-twolines              { height: 3em; }
-textarea.sc-short, select.sc-short                    { height: 8em; }
-textarea.sc-tall, select.sc-tall                      { height: 25em; }
-textarea.sc-fullscreen, select.sc-fullscreen          { height: 40em; }
+textarea.sc-twolines, select.sc-twolines              { height: 3rem; }
+textarea.sc-short, select.sc-short                    { height: 8rem; }
+textarea.sc-tall, select.sc-tall                      { height: 25rem; }
+textarea.sc-fullscreen, select.sc-fullscreen          { height: 40rem; }
 
 /*_____________________ UTILITIES ____________________*/

trunk/lib/App.inc.php

@@ -730 +730 @@
             $priority = LOG_EMERG;
         }
+
+        // In case __FILE__ and __LINE__ are not provided, note that fact.
+        $file = '' == $file ? 'unknown-file' : $file;
+        $line = '' == $line ? 'unknown-line' : $line;
 
         // If log file is not specified, don't log to a file.