From 2c2df90dc0d5eef066a4f6a2613f59f697005411 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 6 Jul 2011 14:19:03 +0200 Subject: [PATCH 1/3] Add missing files from previus checkin --- view/field_custom.tpl | 6 ++++++ view/field_password.tpl | 6 ++++++ view/field_radio.tpl | 6 ++++++ view/field_yesno.tpl | 13 +++++++++++++ view/settings_addons.tpl | 11 +++++++++++ view/settings_tabs.tpl | 6 ++++++ view/theme/dispy/login-bg.gif | Bin 0 -> 237 bytes 7 files changed, 48 insertions(+) create mode 100644 view/field_custom.tpl create mode 100644 view/field_password.tpl create mode 100644 view/field_radio.tpl create mode 100644 view/field_yesno.tpl create mode 100644 view/settings_addons.tpl create mode 100644 view/settings_tabs.tpl create mode 100644 view/theme/dispy/login-bg.gif diff --git a/view/field_custom.tpl b/view/field_custom.tpl new file mode 100644 index 0000000000..be15d3f607 --- /dev/null +++ b/view/field_custom.tpl @@ -0,0 +1,6 @@ + +
+ + $field.2 + $field.3 +
diff --git a/view/field_password.tpl b/view/field_password.tpl new file mode 100644 index 0000000000..e604b7f5da --- /dev/null +++ b/view/field_password.tpl @@ -0,0 +1,6 @@ + +
+ + + $field.3 +
diff --git a/view/field_radio.tpl b/view/field_radio.tpl new file mode 100644 index 0000000000..a915e8eb3c --- /dev/null +++ b/view/field_radio.tpl @@ -0,0 +1,6 @@ + +
+ + + $field.3 +
diff --git a/view/field_yesno.tpl b/view/field_yesno.tpl new file mode 100644 index 0000000000..5d4a775c29 --- /dev/null +++ b/view/field_yesno.tpl @@ -0,0 +1,13 @@ +
+ + + $field.3 +
diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl new file mode 100644 index 0000000000..8fe0b51944 --- /dev/null +++ b/view/settings_addons.tpl @@ -0,0 +1,11 @@ +$tabs + +

$title

+ + +
+ +$settings_addons + +
+ diff --git a/view/settings_tabs.tpl b/view/settings_tabs.tpl new file mode 100644 index 0000000000..893fdfbce2 --- /dev/null +++ b/view/settings_tabs.tpl @@ -0,0 +1,6 @@ + +
+ $account.0 + $plugins.0 +
+
diff --git a/view/theme/dispy/login-bg.gif b/view/theme/dispy/login-bg.gif new file mode 100644 index 0000000000000000000000000000000000000000..cde836c893f64bcfec04b9c817e3371ff122fe19 GIT binary patch literal 237 zcmVb{bmUKcqz}))c5uC(7v?)v4a2P)ZNa- z@$&T2)z|&~{r~^}A^8LV00000EC2ui01yBW000GQ;3tk`X`bk)Wk@<6#nZYULKH{p zEx|?+kif!I0vIL|#ZMubBmjWH2OtmxIFVa~6JQ7!1CK!f5W#StOTv&C3=E8h2vI1s n+#cd5;2fT3B_0kF0v!+!GARoV78n&7dMN`JIW(4+BOw4gP{MS* literal 0 HcmV?d00001 From 23c9af5b26de9b235632678a5486512e52363603 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 6 Jul 2011 17:25:23 +0200 Subject: [PATCH 2/3] Another missing file --- images/onoff.jpg | Bin 0 -> 502 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/onoff.jpg diff --git a/images/onoff.jpg b/images/onoff.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7884912a7f7784762c88f2423eee16a96464d875 GIT binary patch literal 502 zcmex=LJ%Z3brsW+o;O z0s6Oj-S z5fuR$!pIEN!@|nR%E~Fi%grl7GWdUhL6Cz%gh7d!QHg;`kdaxC@&6G9DWLlqn3x%m z01GoKBO51BPD6l!iIJI!m6;VL%gDsQ%pxcx!YXVSG*MBhQQ0`Sa1v0ZI3oiyBTNy5 zW@KUk87~Mj9YuIJS9-ugrAhRHYJ;PT)p;nX7D3hxp2@DGu)Oo}1#tJMo zI6H?|`MMDAnZuzs-)UI9n6>$n$`dos;;cV=wS7JtFTZ_VHZ6YfkIO%WT^-}*-By14 z>in6_g literal 0 HcmV?d00001 From 5526afcf76c261ac8f276ffc4121861d6e175d70 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 6 Jul 2011 17:26:04 +0200 Subject: [PATCH 3/3] let js_upload addon be aware of upload image size limit, and return message to user in case of error --- addon/js_upload/js_upload.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addon/js_upload/js_upload.php b/addon/js_upload/js_upload.php index 042e9a988a..8691389fec 100644 --- a/addon/js_upload/js_upload.php +++ b/addon/js_upload/js_upload.php @@ -129,7 +129,7 @@ function js_upload_post_init(&$a,&$b) { // max file size in bytes - $sizeLimit = 6 * 1024 * 1024; + $sizeLimit = get_config('system','maximagesize'); //6 * 1024 * 1024; $uploader = new qqFileUploader($allowedExtensions, $sizeLimit); @@ -141,6 +141,7 @@ function js_upload_post_init(&$a,&$b) { if(isset($result['error'])) { logger('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , 'LOGGER_DEBUG'); + echo json_encode($result); killme(); }