chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed action admin

Browse Source
pull/2487/head
Alex Aragon 9 years ago
parent f0a64701e7
commit 40588675f8
4 changed files with 165 additions and 40 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 17
      main/admin/user_list.php
  2. 182
      main/img/icons/svg/save_pack.svg
  3. 4
      main/inc/lib/javascript/chat/css/chat.css
  4. 2
      main/template/default/layout/page_body.tpl

17
main/admin/user_list.php
Unescape View File

@ -739,15 +739,13 @@ $form->addElement(
</span>
</a>'
);
$actions = '';
$actionsLeft = '';
$actionsRight = '';
if (api_is_platform_admin()) {
$actions .= '<div style="float:right;">'.
'<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
'</div>';
$actionsRight .= '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>';
}
$actions .= $form->return_form();
$actionsLeft .= $form->return_form();
if (isset ($_GET['keyword'])) {
$parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
@ -756,7 +754,7 @@ if (isset ($_GET['keyword'])) {
$parameters['keyword_lastname'] = Security::remove_XSS($_GET['keyword_lastname']);
$parameters['keyword_username'] = Security::remove_XSS($_GET['keyword_username']);
$parameters['keyword_email'] = Security::remove_XSS($_GET['keyword_email']);
$parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
$parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
$parameters['keyword_status'] = Security::remove_XSS($_GET['keyword_status']);
$parameters['keyword_active'] = Security::remove_XSS($_GET['keyword_active']);
$parameters['keyword_inactive'] = Security::remove_XSS($_GET['keyword_inactive']);
@ -911,9 +909,10 @@ if ($table->get_total_number_of_items() == 0) {
}
}
}
$toolbarActions = Display::toolbarAction('toolbarUser', array(0 => $actionsLeft, 1 => $actionsRight));
$tpl = new Template($tool_name);
$tpl->assign('actions', $actions);
$tpl->assign('actions', $toolbarActions);
$tpl->assign('message', $message);
$tpl->assign('content', $form.$table_result.$extra_search_options);
$tpl->display_one_col_template();

182
main/img/icons/svg/save_pack.svg
Unescape View File

@ -40,9 +40,9 @@
id="namedview63"
showgrid="false"
units="px"
inkscape:zoom="1.2317515"
inkscape:cx="85.883116"
inkscape:cy="19.584322"
inkscape:zoom="1.7419597"
inkscape:cx="155.07291"
inkscape:cy="72.80583"
inkscape:window-x="41"
inkscape:window-y="21"
inkscape:window-maximized="1"
@ -56,7 +56,7 @@
x2="24"
y1="43.646"
x1="24"
gradientTransform="translate(0,54.4)">
gradientTransform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)">
<stop
stop-color="#824F26"
offset=".0056"
@ -73,7 +73,7 @@
x2="23.92"
y1="29.357"
x1="23.92"
gradientTransform="translate(0,54.4)">
gradientTransform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)">
<stop
stop-color="#FFAE00"
offset="0"
@ -90,7 +90,7 @@
x2="8.8548002"
y1="18.899"
x1="24.042"
gradientTransform="translate(0,54.4)">
gradientTransform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)">
<stop
stop-color="#FFAE00"
offset="0"
@ -107,7 +107,7 @@
x2="25.52"
y1="35.867001"
x1="37.541"
gradientTransform="translate(0,54.4)">
gradientTransform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)">
<stop
stop-color="#FFFFA2"
offset=".0056"
@ -124,7 +124,7 @@
x2="23.871"
y1="11.92"
x1="23.871"
gradientTransform="translate(0,54.4)">
gradientTransform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)">
<stop
stop-color="#FF6D00"
offset="0"
@ -150,69 +150,197 @@
offset="1"
id="stop37" />
</linearGradient>
<linearGradient
id="XMLID_4_"
y2="99.458"
gradientUnits="userSpaceOnUse"
x2="64"
y1="-1.1782"
x1="64"
gradientTransform="matrix(0.95045356,0,0,0.95045356,-165.73115,3.7466424)">
<stop
style="stop-color:#00008d;"
offset="0"
id="stop5" />
<stop
style="stop-color:#0053bd;"
offset="1"
id="stop7-2" />
<midPointStop
style="stop-color:#00008D;"
offset="0" />
<midPointStop
style="stop-color:#00008D;"
offset="0.5" />
<midPointStop
style="stop-color:#0053BD;"
offset="1" />
</linearGradient>
<radialGradient
id="XMLID_5_"
gradientUnits="userSpaceOnUse"
cy="107.82"
cx="27.576"
gradientTransform="matrix(0.95045356,0,0,1.0041542,-165.73115,3.2290444)"
r="115.48">
<stop
style="stop-color:#ffffff;"
offset="0"
id="stop12-0" />
<stop
style="stop-color:#ddeeff;"
offset="0.057175"
id="stop14-2" />
<stop
style="stop-color:#b5daff;"
offset="0.13293"
id="stop16" />
<stop
style="stop-color:#9dceff;"
offset="0.19331"
id="stop18" />
<stop
style="stop-color:#94caff;"
offset="0.23034"
id="stop20" />
<stop
style="stop-color:#0b74ff;"
offset="0.59551"
id="stop22-8" />
<stop
style="stop-color:#0035ed;"
offset="0.81461"
id="stop24-3" />
<midPointStop
style="stop-color:#FFFFFF;"
offset="0" />
<midPointStop
style="stop-color:#FFFFFF;"
offset="0.4" />
<midPointStop
style="stop-color:#94CAFF;"
offset="0.230337" />
<midPointStop
style="stop-color:#94CAFF;"
offset="0.5" />
<midPointStop
style="stop-color:#0B74FF;"
offset="0.595506" />
<midPointStop
style="stop-color:#0B74FF;"
offset="0.5" />
<midPointStop
style="stop-color:#0035ED;"
offset="0.814607" />
</radialGradient>
<linearGradient
id="XMLID_6_-3"
y2="61.277"
gradientUnits="userSpaceOnUse"
x2="62.341999"
y1="8.8261995"
x1="62.341999"
gradientTransform="matrix(0.95045356,0,0,0.95045356,-165.73115,3.7466424)">
<stop
style="stop-color:#ffffff;"
offset="0"
id="stop29-7" />
<stop
style="stop-color:#74aeff;"
offset="1"
id="stop31-0" />
<midPointStop
style="stop-color:#FFFFFF;"
offset="0" />
<midPointStop
style="stop-color:#FFFFFF;"
offset="0.5" />
<midPointStop
style="stop-color:#74AEFF;"
offset="1" />
</linearGradient>
</defs>
<g
id="g4193"
transform="matrix(2.6135561,0,0,2.6135561,0.652436,-141.52501)">
id="g5122"
transform="matrix(1.0695932,0,0,1.0695932,-4.4958872,-4.4788808)">
<path
style="opacity:0.2"
inkscape:connector-curvature="0"
id="path39"
d="M 24.6,57.58 4.368,65.064 c -0.294,0.109 -0.49,0.39 -0.49,0.704 l 0,26.695 c 0,0.316 0.198,0.599 0.495,0.706 l 0.432,0.156 20.15,7.396 c 0.163,0.06 0.343,0.061 0.508,0.003 L 45.495,93.68 c 0.301,-0.105 0.501,-0.389 0.501,-0.707 l 0,-27.51 c 0,-0.318 -0.2,-0.602 -0.5,-0.708 L 25.109,57.575 C 24.945,57.518 24.764,57.519 24.6,57.58 Z" />
d="M 64.945916,8.9635502 12.068449,28.523404 c -0.768385,0.284878 -1.280642,1.019287 -1.280642,1.839944 l 0,69.768882 c 0,0.82588 0.517484,1.56552 1.29371,1.84517 l 1.129056,0.40771 52.663155,19.32986 c 0.42601,0.15682 0.89645,0.15943 1.327687,0.008 l 52.354755,-18.40988 c 0.78668,-0.27443 1.30939,-1.01668 1.30939,-1.84779 l 0,-71.898927 c 0,-0.831111 -0.52271,-1.573361 -1.30678,-1.850398 L 66.276216,8.9504825 c -0.428623,-0.1489727 -0.901677,-0.1463592 -1.3303,0.013068 z" />
<path
style="opacity:0.2"
inkscape:connector-curvature="0"
id="path41"
d="M 24.225,57.205 3.993,64.689 c -0.294,0.109 -0.49,0.39 -0.49,0.704 l 0,26.695 c 0,0.316 0.198,0.599 0.495,0.706 l 0.432,0.156 20.15,7.396 c 0.163,0.06 0.343,0.061 0.508,0.003 L 45.12,93.305 c 0.301,-0.105 0.501,-0.389 0.501,-0.707 l 0,-27.51 c 0,-0.318 -0.2,-0.602 -0.5,-0.708 L 24.735,57.2 c -0.165,-0.057 -0.346,-0.056 -0.51,0.005 z" />
d="M 63.965833,7.9834667 11.088366,27.543321 c -0.768386,0.284877 -1.280643,1.019286 -1.280643,1.839943 l 0,69.76888 c 0,0.825884 0.517484,1.565516 1.29371,1.845166 l 1.129057,0.40772 52.663155,19.32986 c 0.42601,0.15681 0.89645,0.15943 1.327686,0.008 L 118.57609,102.333 c 0.78668,-0.27442 1.30939,-1.01667 1.30939,-1.84778 l 0,-71.898931 c 0,-0.83111 -0.52271,-1.57336 -1.30678,-1.850397 L 65.298746,7.9703989 c -0.431237,-0.1489727 -0.90429,-0.1463591 -1.332913,0.013068 z" />
<path
style="fill:url(#XMLID_6_)"
inkscape:connector-curvature="0"
id="path43"
d="M 23.663,56.83 3.431,64.314 c -0.294,0.109 -0.49,0.39 -0.49,0.704 l 0,26.695 c 0,0.316 0.198,0.599 0.495,0.706 l 0.432,0.156 20.15,7.396 c 0.164,0.06 0.343,0.061 0.508,0.003 L 44.558,92.93 c 0.301,-0.105 0.501,-0.389 0.501,-0.707 l 0,-27.51 c 0,-0.318 -0.2,-0.602 -0.5,-0.708 l -20.386,-7.18 c -0.166,-0.057 -0.346,-0.056 -0.51,0.005 z" />
d="M 62.497014,7.0033832 9.619547,26.563237 c -0.7683855,0.284878 -1.2806425,1.019287 -1.2806425,1.839944 l 0,69.76888 c 0,0.825883 0.5174841,1.56552 1.2937103,1.845169 l 1.1290562,0.40772 52.663155,19.32986 c 0.428624,0.15681 0.89645,0.15942 1.327687,0.008 l 52.354757,-18.40989 c 0.78668,-0.27443 1.30939,-1.01667 1.30939,-1.847786 l 0,-71.898928 c 0,-0.831111 -0.52271,-1.573361 -1.30678,-1.850398 L 63.829928,6.9903154 C 63.396077,6.8413427 62.925637,6.8439562 62.497014,7.0033832 Z" />
<polygon
transform="translate(0,54.4)"
transform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)"
style="fill:#febf59"
id="polygon45"
points="23.989,11.065 4.334,11.065 4.334,37.07 4.349,37.07 23.92,44.311 23.989,44.285 " />
<polygon
transform="translate(0,54.4)"
transform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)"
style="fill:#ffffff"
id="polygon47"
points="23.989,11.065 23.989,44.285 23.92,44.311 43.491,37.07 43.666,37.07 43.666,11.065 " />
<polygon
transform="translate(0,54.4)"
transform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)"
style="fill:#ffffff"
id="polygon49"
points="4.334,11.065 23.92,18.311 43.506,11.065 23.92,3.82 " />
points="43.506,11.065 23.92,3.82 4.334,11.065 23.92,18.311 " />
<path
style="fill:#ffffff"
inkscape:connector-curvature="0"
id="path51"
d="m 4.334,65.465 m 19.586,7.246 -19.586,-7.246 0,25.802 0.015,0 19.571,7.239 0.069,-0.025 0,-25.795 -0.069,0.025 z" />
d="m 11.979588,29.57144 m 51.18911,18.937828 -51.18911,-18.937828 0,67.434975 0.0392,0 51.149907,18.919535 0.180335,-0.0653 0,-67.416681 -0.180335,0.06534 z" />
<path
style="fill:url(#XMLID_7_)"
inkscape:connector-curvature="0"
id="path53"
d="M 23.92,58.22 4.609,65.364 c 3.172,1.173 6.345,2.347 9.518,3.521 2.17,0.803 4.34,1.605 6.51,2.408 0.884,0.327 2.323,1.214 3.283,1.214 0.831,0 2.078,-0.768 2.843,-1.051 2.317,-0.857 4.634,-1.714 6.95,-2.571 3.173,-1.173 6.345,-2.347 9.518,-3.521 L 23.92,58.22 Z" />
d="M 63.168698,10.636226 12.698316,29.307471 c 8.2902,3.065701 16.583014,6.134016 24.875827,9.202331 5.671417,2.098685 11.342833,4.194757 17.01425,6.293443 2.310384,0.854633 6.071291,3.172857 8.580305,3.172857 2.171865,0 5.430969,-2.007211 7.43034,-2.746847 6.055609,-2.239818 12.111219,-4.479635 18.164215,-6.719453 8.292813,-3.065701 16.583017,-6.134016 24.875827,-9.202331 L 63.168698,10.636226 Z" />
<path
style="fill:url(#XMLID_8_)"
inkscape:connector-curvature="0"
id="path55"
d="m 4.334,66.095 0,25.249 0.015,0 19.204,7.112 C 23.557,90.082 23.796,81.382 23.485,73.187 17.101,70.824 10.717,68.46 4.334,66.095 Z" />
d="m 11.979588,31.21798 0,65.989678 0.0392,0 50.190732,18.587612 C 62.219977,93.909351 62.844617,71.171413 62.031801,49.75332 45.346859,43.577487 28.661917,37.399041 11.979588,31.21798 Z" />
<path
style="fill:url(#XMLID_9_)"
inkscape:connector-curvature="0"
id="path57"
d="m 24.441,98.583 19.051,-7.023 0.174,0 0,-25.19 c -2.207,0.768 -18.723,6.53 -19.097,7.044 -0.392,0.536 -0.14,24.093 -0.128,25.169 z" />
d="m 64.530361,116.12719 49.790859,-18.355003 0.45476,0 0,-65.835479 C 109.00786,33.943919 65.842366,49.00323 64.864896,50.346598 63.840382,51.747464 64.498998,113.315 64.530361,116.12719 Z" />
<path
style="fill:url(#XMLID_10_)"
inkscape:connector-curvature="0"
id="path59"
d="M 24.035,65.382 43.3,65.336 23.941,64.164 l 0,-6.047 c 0,0 -0.781,5.729 -0.984,6 -0.203,0.271 -18.516,1.265 -18.516,1.265 l 18.469,-0.281 0.938,7.453 0.187,-7.172 z" />
<polyline
transform="translate(0,54.4)"
style="fill:none"
id="polyline61"
points="0 48 0 0 48 0 48 48" />
d="m 63.469257,29.354515 50.350163,-0.120224 -50.595837,-3.063087 0,-15.804174 c 0,0 -2.041188,14.973063 -2.57174,15.681336 -0.530552,0.708274 -48.392604,3.306149 -48.392604,3.306149 l 48.269767,-0.734409 2.451516,19.478833 0.488735,-18.744424 z" />
</g>
<polyline
points="0 48 0 0 48 0 48 48"
id="polyline61"
style="fill:none"
transform="matrix(2.6135561,0,0,2.6135561,0.652436,0.65244184)" />
<g
id="g5105"
transform="matrix(0.64877838,0,0,0.64877838,104.9525,50.991411)">
<path
inkscape:connector-curvature="0"
id="path9"
d="m -50.298565,66.300743 c -0.646309,-1.892353 -2.338116,-3.155505 -4.239023,-3.155505 l -15.844061,0 0,-39.867725 c 0,-5.870002 -4.495645,-10.628923 -10.043443,-10.628923 l -52.105768,0 c -5.54779,0 -10.04439,4.758731 -10.04439,10.628923 l 0,39.867725 -12.69046,0 c -1.90119,0 -3.59784,1.263152 -4.23921,3.155505 -0.64136,1.894254 -0.09,4.010915 1.37835,5.286423 l 50.36263,43.828264 c 1.66235,1.44469 4.05939,1.44469 5.72173,0 l 50.365487,-43.828264 c 1.463699,-1.277409 2.014962,-3.392169 1.378158,-5.286423 z"
style="fill:url(#XMLID_4_)" />
<path
inkscape:connector-curvature="0"
id="path26"
d="m -74.882997,67.908911 0,-44.631398 c 0,-3.234394 -2.487337,-5.865249 -5.542095,-5.865249 l -52.105768,0 c -3.05666,0 -5.54209,2.630855 -5.54209,5.865249 l 0,44.631398 -17.19276,0 50.36264,43.828269 50.365482,-43.828269 -20.345409,0 z"
style="fill:url(#XMLID_5_)" />
<path
inkscape:connector-curvature="0"
id="path33"
d="m -116.86928,62.057919 c 13.68558,-7.20919 26.013911,-15.217712 40.277368,-17.873279 l 0,-21.54203 c 0,-1.887601 -1.719371,-3.423534 -3.83318,-3.423534 l -52.105768,0 c -2.11381,0 -3.83318,1.535933 -3.83318,3.423534 l 0,38.927726 c 6.29676,2.877974 13.13812,3.724828 19.49476,0.487583 z"
style="fill:url(#XMLID_6_-3)" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 12 KiB

4
main/inc/lib/javascript/chat/css/chat.css
Unescape View File

@ -6,9 +6,7 @@
right: 20px;
display: block;
}
.chatboxheadmain {
padding: 5px;
color: #333333;
.chatboxheadmain {
color: #ffffff;
border-right:1px solid #222;
border-left:1px solid #222;

2
main/template/default/layout/page_body.tpl
Unescape View File

@ -1,6 +1,6 @@
{# Actions #}
{% if actions != '' %}
<div class="actions">
<div class="actions-line">
{{ actions }}
</div>
{% endif %}

Write Preview
Loading…
Cancel
Save