From 4f0789a9c39f220ddb0ec0710c6d833dd42b2d77 Mon Sep 17 00:00:00 2001 From: aragonc Date: Thu, 5 Nov 2015 16:45:02 -0500 Subject: [PATCH] fix class table --- app/Resources/public/css/base.css | 10 +- main/admin/usergroups.php | 8 +- main/img/icons/16/edit.png | Bin 645 -> 624 bytes main/img/icons/32/add-class.png | Bin 0 -> 1777 bytes main/img/icons/svg/add-class.svg | 2820 +++++++++++++++++++++++++++++ main/inc/ajax/model.ajax.php | 16 +- main/inc/lib/display.lib.php | 4 +- main/user/class.php | 8 +- 8 files changed, 2845 insertions(+), 21 deletions(-) create mode 100644 main/img/icons/32/add-class.png create mode 100644 main/img/icons/svg/add-class.svg diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index b5d88a7f73..fe50d9713d 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -2408,6 +2408,10 @@ form .formw .freeze { .label_tag.course { background-color: #62cffc; } +.label{ + font-weight: normal; + font-size: 90%; +} .invisible { color: #999; } @@ -5102,13 +5106,13 @@ div#chat-remote-video video { } .ui-accordion .ui-accordion-content-active{ -} -.ui-jqgrid-view .label-success{ - font-size: 14px; } .ui-jqgrid-view .ui-widget-content a{ color:#666666; } +.ui-jqgrid-view .ui-widget-content a.btn{ + color: #fff; +} .ui-jqgrid-view .ui-state-default, .ui-jqgrid-view .ui-widget-content .ui-state-default, .ui-jqgrid-view .ui-widget-header .ui-state-default{ diff --git a/main/admin/usergroups.php b/main/admin/usergroups.php index a05342ac02..a04fd4b95d 100755 --- a/main/admin/usergroups.php +++ b/main/admin/usergroups.php @@ -60,8 +60,8 @@ $column_model = array( array('name'=>'users', 'index'=>'users', 'width'=>'15', 'align'=>'left'), array('name'=>'courses', 'index'=>'courses', 'width'=>'15', 'align'=>'left'), array('name'=>'sessions', 'index'=>'sessions', 'width'=>'15', 'align'=>'left'), - array('name'=>'group_type', 'index'=>'group_type', 'width'=>'15', 'align'=>'left'), - array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'left', 'sortable'=>'false','formatter'=>'action_formatter'), + array('name'=>'group_type', 'index'=>'group_type', 'width'=>'15', 'align'=>'center'), + array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'center', 'sortable'=>'false','formatter'=>'action_formatter'), ); //Autowidth @@ -76,8 +76,8 @@ $action_links = 'function action_formatter (cellvalue, options, rowObject) { .' ' .' ' .' ' - .' ' - .' \'; + .' ' + .' \'; }'; ?> diff --git a/main/img/icons/16/edit.png b/main/img/icons/16/edit.png index 8396177bc7311d72af361fe83ac36c632e69d5eb..4a9c6de9f7640b261cf698158718230f9922ca0e 100755 GIT binary patch delta 554 zcmV+_0@eM61@HurQGeeH1r;kNrX}p)0005~NklWOGuPa7{>Ac_)XI|>h#Sx z%{St0lTb!RAmPG{u#8+(AR<9j5E@J*=0>v%xQPP0TNIO2SP;eNBEbYR5M6XZ#3BeP zrHf^B7b_>Hr-imkZR**)i*tUQ!~33N@Rt-~GRSuTnv&cH*MB)&t8*f@J3UN9j*vvm zIfikdrE-g2)%tWT!|dIKD;2ix!fSB@P=Aa&?eg-J*Lv=d29VyK)!1OALRs_yXgZvL0{}brxuK;v6kg-dDguiEGFkQ~DxbP~oilK1 zsNOGiAU!OQCfd|pogCdrpa7tV%<0aY1HfL7x&1-4FMp~lNS!&7S~PGvLsbUl0A*OS z&%1G<_3p>Xc&Rx-`gUE9FD+0IJ(71ce2VQGeV89S|!m>@sw!0006KNklp+kod!Vc9+Vu!+I2t{_03`?e6OotUYLTQ;~D_9-^K`I3geV{fpEs>;{ zozzx0hR)OVJ{DGVtfDqwQGVT!r73z4c zQojoTE}G1V=X>)FH@|t6WH%_rc9Tnf4%QlY7P?aa0DpIRV!1}Dxe>l>B>fPg&q^+K zicbL>JsM4U%9|fYmi5Vjq9|`eh=&?7(k^D7Zf6aYegHV*a3l|KDHP7Pj~e(ZaFU$z zG4`^AOO4!xs!;`U99gKc?x! zG)#2eKvp#*MMX#o2nkO}xE?sJM>>_JK2rNcApS+`73iD~F3q!=1F>K*dTn%+g0M#C z`Lhq(xrb_Gcvw8WdezAnApCFPhhW$0f`WZR*(}v-Dp>#WV_1nUhI_jgh!s!}Dg(ZTZL)k|_Lw{g zR)dn%7Bh@e%e8pqSGzG5mw>FImKLIVS$aRdPFXk#jsuQ^=Que3p`}x4RxAy#FCHA~ zz5>_sJeT3%Dpif>nGCU)p1@aM1FDfT&7in>EkFXO!{o#1e`x&^~ z0_R%clmfUwKfu~BpQGxaYV*Q{YOv_}UG%;67Y5{ZFBqJ6ed^}8pFy= zaPn%LciR1ES_&tbBygby*2O9-XH9^&R<$e{22t`1qHvkYA~88i7nj|+j#r;o#*F; zXKWc)F_Be`v!l1^FkO!J_TaXsI9$JrJ&l_|sNBDgbVFyGgp``$keb-oR=j@Jwdj%ohAgb%pHNwz%FE93lCQIT@sl*vJe}9Se95R>Q;|9}XWJ9DjxFV)T_`fz zWYBvaDEg%5LY{`}9$mc`sjceGt!aj477DY+me!1~uiIN!l?PASI;nvk3X4~O#x&gZ zQ0{xqH2j&md;DqOH0iPoLco&Hb2K;n0))U+O8_YHhxz{IE&y)bJ;R3``&d+w7Ov$s z<-tcBwXdh;y+m-l&9C8NX&xYO9Z)m_WG(ln++4;~6*#2r5mYlb-&E=;2}JX}lqHoC ze*}Pu%o-E}d^ku#D$0Yu`fm59yxU#5V|B&OZ*6SY?{2N#a7ybHLwW)QcjhN2TaRMR zPf8aE;c@HUdCuQB0zkBU12x5sq_ShQ+&TfknA3)8z-Usz71F>13rIjTRR^PAt1o+b zKaggSfKjdDbi{ss~ys@j- z3Z2WBs|x3yaMSYI;$xj{@v$HCLD#E0SCu`rdGned?cDv;W=#%BS1(`eJ$w3Z7drY! zF6l26z7`Ir@=K-r8zn%RQ7PKC;Gds`PF?@q^@)dhKJRX<4~J^|#*)D=Myxn63Rufu zT>jYB9eo!Y8pfwmH+g3x;n3ptHK|sRr{Ci*|cfk zNaM<}ITbO0=Ls%fDVey^Qo6P4%^R0tp3-@t8f+cD`ek9wpN9s`Cd-zpWGQzQ3=iwv zycuvVTq--&* + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php index 1dceab7396..7931906509 100755 --- a/main/inc/ajax/model.ajax.php +++ b/main/inc/ajax/model.ajax.php @@ -1505,19 +1505,19 @@ switch ($action) { $group['users'] = count($obj->get_users_by_usergroup($group['id'])); if ($obj->usergroup_was_added_in_course($group['id'], $course_id)) { $url = 'class.php?action=remove_class_from_course&id='.$group['id'].'&'.api_get_cidreq(); - //$icon = Display::return_icon('delete.png', get_lang('Remove')); - $class = 'btn btn-danger'; - $text = get_lang('Remove'); + $icon = Display::return_icon('delete.png', get_lang('Remove')); + //$class = 'btn btn-danger'; + //$text = get_lang('Remove'); } else { $url = 'class.php?action=add_class_to_course&id='.$group['id'].'&'.api_get_cidreq().'&type=not_registered'; - $class = 'btn btn-primary'; - //$icon = Display::return_icon('add.png', get_lang('Add')); - $text = get_lang('Add'); + //$class = 'btn btn-primary'; + $icon = Display::return_icon('add.png', get_lang('Add')); + //$text = get_lang('Add'); } switch ($group['group_type']) { case 0: - $group['group_type'] = Display::label(get_lang('Class'), 'info'); + $group['group_type'] = Display::label(get_lang('Class'), 'primary'); break; case 1: $group['group_type'] = Display::label(get_lang('Social'), 'success'); @@ -1528,7 +1528,7 @@ switch ($action) { $group['status'] = $role; - $group['actions'] = Display::url($text, $url, ['class' => $class]); + $group['actions'] = Display::url($icon, $url); $new_result[] = $group; } $result = $new_result; diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index f10bc3f776..8222e9c28d 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -1831,8 +1831,8 @@ class Display case 'info': $class = 'label-info'; break; - case 'inverse': - $class = 'label-inverse'; + case 'primary': + $class = 'label-primary'; break; default: $class = 'label-default'; diff --git a/main/user/class.php b/main/user/class.php index 42cf2b9715..53e16b902f 100755 --- a/main/user/class.php +++ b/main/user/class.php @@ -43,7 +43,7 @@ if (api_is_allowed_to_edit()) { $actions .= '
'; if ($type == 'registered') { $actions .= ''. - Display::return_icon('add.png', get_lang("AddClassesToACourse"), array(), ICON_SIZE_MEDIUM).''; + Display::return_icon('add-class.png', get_lang("AddClassesToACourse"), array(), ICON_SIZE_MEDIUM).''; } else { $actions .= ''. Display::return_icon('back.png', get_lang("Classes"), array(), ICON_SIZE_MEDIUM).''; @@ -124,13 +124,13 @@ $columnModel = array( 'name' => 'group_type', 'index' => 'group_type', 'width' => '15', - 'align' => 'left', + 'align' => 'center', ), array( 'name' => 'actions', 'index' => 'actions', - 'width' => '20', - 'align' => 'left', + 'width' => '10', + 'align' => 'center', 'sortable' => 'false', ), );