From 9e74d57d66a1554c9763d722f32c94b3d5525bab Mon Sep 17 00:00:00 2001 From: BOHUNG Date: Tue, 28 Jan 2020 20:48:13 +0800 Subject: [PATCH] add --- app/assets/images/edit.gif | Bin 0 -> 2128 bytes app/assets/images/trash.gif | Bin 0 -> 2583 bytes .../javascripts/admin/olympiamanagement.js | 11 +++ .../stylesheets/admin/olympiamanagement.scss | 64 ++++++++++++++++++ app/assets/stylesheets/olympiamanagement.scss | 6 ++ .../olympiamanagements/class_setting.html.erb | 29 ++++++++ config/locales/en.yml | 10 ++- config/locales/zh_tw.yml | 10 ++- lib/olympiamanagement/engine.rb | 16 ++--- 9 files changed, 136 insertions(+), 10 deletions(-) create mode 100644 app/assets/images/edit.gif create mode 100644 app/assets/images/trash.gif create mode 100644 app/assets/javascripts/admin/olympiamanagement.js create mode 100644 app/assets/stylesheets/admin/olympiamanagement.scss create mode 100644 app/assets/stylesheets/olympiamanagement.scss diff --git a/app/assets/images/edit.gif b/app/assets/images/edit.gif new file mode 100644 index 0000000000000000000000000000000000000000..3fa5e1f77230a83927f1f77f9b92a48560cc9f05 GIT binary patch literal 2128 zcmV-W2(R}?Nk%w1VK4wN0Qdg@_}Z>u!|1iPx9O;O+lXY0jEqvN+UxcE?b^!!|Nl{n zuUT1KXMVKhnQb+w*}!#fkJRm%nw#wG?AzPhw^l)%yW4P;#-`Km0Cl@cTZ6@GQA)Yu zGJ3V;^7*pE)SsfU_}jEqXq2a@w)Oh`tE;UGW3A(-g{wn1`27BGaB#rb>lj<11Z=Ya zq1@r&;rGaw^vk69`1rEY>X0=so?&Xj!otht^`SB^oT+tbt2!DUMUip}-B zg!Q|IX@#oTnuVOR(|3laXlQ8F>Gm9Cr%R8>oy6eJ&(Hku-^JqdwA=C2;P3VI^(wC4 z+o_t>f?fRX+l-i`_tK^Hz=r9ti1YdU`r*TEr?_&v;p)4csgyd; zoYegM{L6u9(R^Cn?)d%w|Kg5l`{l_^|pEZ{r>Lw{8MC(#Fvy6ZL{pbqDNSNlvGrAf0y9#`G(Kyp4aY~ zuhmadSh{}_YU#+qfUeTwzr6eB&hYpApWE@cT~3wE z>-g2GX^gS>*sT5b>!vy{z~A!Nyt~}8uh`Mi7nH})nU%F}Vq$KUt=8{kve3Y#qpzBo z%DAK6!@+-qk_w;JG-aC*h{W!nc5i2WeQ0O)!jXGUN9N|`^0|*+eWcjq@sPIEmAc*G zt(Wk$f2U1BrBO@o$FK^8$IQvrkj3P~)7s76?7OCt4v)`=n8fqAgx28XOKtN;K1A^8LW00930EC2ui05AYB000R80RIUbNU)&6g9sBUT*$DY!-5B%wAgUX zNy1Fj;_&g%C(%QNik<|(5n$K8YcU{_>(Rqmqiky|enc4HiJ}AvB$cd%QeYhpEaPBc zv5ka;nFlA?#K~0C23S)VacLBE=(iL#`XDVxN{1$0n|8r>h4PqF4#`!V%COLRs*d0c=f5xc?;SAXPV%mwS#xDVdB8Xd$5`jF>p%<(34G zTSErG3Gc*~$*7eGDs&k`W?aDxommy{^VSU;n8q3-CAE@a4hjWwZR8IC0K^OtSk-RW z+mH30Tw%)QloBa$)?q=Q#lY~)f2bV)_h(4?DnGAeHl(CO64Ouit_N$-%|sUi_)C-+ z;`szha92-Cop(=+zUVapo}L`kU_uzh*A

Z4<%l7$@+O!Lkd_T+jG6bSU_=?gvtD{ioehC#^)C^YM=qmJgVi~?A|@J1Cd zU?Ii5QefdL095!8?zrS85e6OTrt9pp(ikC+D*PaV#$<4aqVK+^RN=3`03$liJ{=US zuCoV#QNkFi1VfAxaDd<=2x!0ohqqK%d@;tsBAY}sT{vLF2p&7@O=e$=(LfMVsO%pI zl1(NG8vIc40v>qG?C$_%-hgNyH7L*pG(4x9ZYH1@lgKkPoDc+ug!Co~KUF~Ow%a}o z%fl*1TAgSgNlXDoJ_mIFjlu!VUU7j8BFHkvJ*AZLK;jfozyl_bWAb4X_7qw7k*NN2 zg$pDoaD)ner_0I(SJWYdHmGa!0qTQ%@x>i?oN#&FGtA(QF!-c7kQfrIfyxocT){KC zWpt2k6O|-i$tKKiQo-|b$bp0hB79)|Iq6tJgc}7!Ktc^l4&=lRQz&48F;@sb{0JA& zB263YH2*yGNJu}&{epyGi5mj!Fo6paNRdHeFbn|z!2)_np8`k0gi)mL0E278{Gx}1 z3f>P1AxJ|C1fU*;pr8+H7y<(-(ScEz@PsC$#RWQWfDXKmf=IaE9DslgwzvQ^4ROK* zKEMDAG~ocFH~3!MKG#CjC-)b5?BF*4A@XbGl{_jL|_gE zv;mBWykilHu!lV?VUI$<#{LY07=egk7&VB5Iq0FtMK)58d!&O57J)`JR+1p&o5C!H zpn^Qw0F? zg$n18!8EQhnc|y31QuZqIb7fZfB*z49$|?HOaPGB6vzl%Ab@gU!vdx-1t=b2%$TGT zA&CH?E;3Lp3{+qPjYherLUj0nbUebAX+oz!m5Ip$q@V!ET&P0&-~#_?MWPtZs73`E G5CA(G#4UIL literal 0 HcmV?d00001 diff --git a/app/assets/images/trash.gif b/app/assets/images/trash.gif new file mode 100644 index 0000000000000000000000000000000000000000..a752a91ba5f7e9822a421f5b8f6a8cd5229b6461 GIT binary patch literal 2583 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 + + +

+ <%=t('olympiamanagement.class_setting')%> +
+
  • <%= t('olympiamanagement.class_number')+"(#{t('olympiamanagement.spacing')})"%>
    • +
    • + ~ +
    • +
    +
    +
  • <%= t('olympiamanagement.enrollment_available') %>
    • +
    +
    + + +
    + + + + + + + + + + +
    <%= t('olympiamanagement.class_number') %><%= t('olympiamanagement.enrollment_available') %><%= t('olympiamanagement.action') %>
    \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 594abc8..d27d99c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,6 +1,7 @@ en: olympiamanagement: olympiamanagement: Olympia competition management + add_school_data: Add school data school_data_list: School data list class_setting: Class setting sign_up_setting: Sign up setting @@ -8,4 +9,11 @@ en: export_sign_up_student_data: Export sign up student data download_scan_file_of_certificate: Download scan file of certificate import_editing_number_of_school_class: Import editing number of school class - \ No newline at end of file + class_number: Number of class in school + spacing: spacing + enrollment_available: Enrollment available + confirm: Confirm + cancel: Cancel + action: Action + edit: Edit + delete: Delete \ No newline at end of file diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 192667a..27bcccd 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -8,4 +8,12 @@ zh_tw: export_school_connection_data: 匯出學校聯絡資料 export_sign_up_student_data: 匯出報名學生資料 download_scan_file_of_certificate: 下載獎狀掃描檔 - import_editing_number_of_school_class: 匯入修改學校班級數 \ No newline at end of file + import_editing_number_of_school_class: 匯入修改學校班級數 + class_number: 全校班級數 + spacing: 間距 + enrollment_available: 可報名人數 + confirm: 確定 + cancel: 取消 + action: 動作 + edit: 編輯 + delete: 刪除 \ No newline at end of file diff --git a/lib/olympiamanagement/engine.rb b/lib/olympiamanagement/engine.rb index 6928a67..c2a5e51 100644 --- a/lib/olympiamanagement/engine.rb +++ b/lib/olympiamanagement/engine.rb @@ -22,42 +22,42 @@ module Olympiamanagement :active_for_action=>{'admin/olympiamanagements'=>'index'}, :available_for => 'users' context_link 'olympiamanagement.add_school_data', - :link_path=>"admin_olympiamanagements_path" , + :link_path=>"admin_olympiamanagements_add_school_data_path" , :priority=>1, :active_for_action=>{'admin/olympiamanagements'=>'add_school_data'}, :available_for => 'users' context_link 'olympiamanagement.school_data_list', - :link_path=>"admin_olympiamanagements_path" , + :link_path=>"admin_olympiamanagements_school_data_list_path" , :priority=>1, :active_for_action=>{'admin/olympiamanagements'=>'school_data_list'}, :available_for => 'users' context_link 'olympiamanagement.class_setting', - :link_path=>"admin_olympiamanagements_path" , + :link_path=>"admin_olympiamanagements_class_setting_path" , :priority=>1, :active_for_action=>{'admin/olympiamanagements'=>'class_setting'}, :available_for => 'users' context_link 'olympiamanagement.sign_up_setting', - :link_path=>"admin_olympiamanagements_path" , + :link_path=>"admin_olympiamanagements_sign_up_setting_path" , :priority=>1, :active_for_action=>{'admin/olympiamanagements'=>'sign_up_setting'}, :available_for => 'users' context_link 'olympiamanagement.export_school_connection_data', - :link_path=>"admin_olympiamanagements_path" , + :link_path=>"admin_olympiamanagements_export_school_connection_data_path" , :priority=>1, :active_for_action=>{'admin/olympiamanagements'=>'export_school_connection_data'}, :available_for => 'users' context_link 'olympiamanagement.export_sign_up_student_data', - :link_path=>"admin_olympiamanagements_path" , + :link_path=>"admin_olympiamanagements_export_sign_up_student_data_path" , :priority=>1, :active_for_action=>{'admin/olympiamanagements'=>'export_sign_up_student_data'}, :available_for => 'users' context_link 'olympiamanagement.download_scan_file_of_certificate', - :link_path=>"admin_olympiamanagements_path" , + :link_path=>"admin_olympiamanagements_download_scan_file_of_certificate_path" , :priority=>1, :active_for_action=>{'admin/olympiamanagements'=>'download_scan_file_of_certificate'}, :available_for => 'users' context_link 'olympiamanagement.import_editing_number_of_school_class', - :link_path=>"admin_olympiamanagements_path" , + :link_path=>"admin_olympiamanagements_import_editing_number_of_school_class_path" , :priority=>1, :active_for_action=>{'admin/olympiamanagements'=>'import_editing_number_of_school_class'}, :available_for => 'users'