From 5a670f935250a42c52291dd4d78f57c3fb784d76 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 1 Mar 2012 19:30:11 +0000 Subject: [PATCH] =?UTF-8?q?-=20Reestructuraci=C3=B3n=20del=20proyecto=20->?= =?UTF-8?q?=20las=20vistas=20se=20pasan=20del=20tema=20a=20la=20carpeta=20?= =?UTF-8?q?'protected/views'.=20-=20Grid=20completado=20en=20'Usuario',=20?= =?UTF-8?q?pendiente=20en=20Candidato.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Incam_IntranetNueva/trunk@17 77cfc57b-8ef4-1849-9df6-4a38aa5da120 --- www/css/bg.gif | Bin 243 -> 0 bytes www/{themes/intranet => }/css/custom.css | 6 +- www/css/form.css | 160 ----- www/css/gridview.css | 638 ++++++++++++++++++ www/css/gridview2.css | 367 ++++++++++ www/css/ie.css | 36 - www/{themes/intranet => }/css/ie7.css | 0 www/{themes/intranet => }/css/ie8.css | 0 www/{themes/intranet => }/css/ie9.css | 0 www/css/main.css | 229 ------- www/css/pager.css | 77 +++ .../intranet => }/css/plugins/colorbox.css | 0 .../intranet => }/css/plugins/colorpicker.css | 0 .../intranet => }/css/plugins/elfinder.css | 0 .../css/plugins/fullcalendar.css | 0 .../css/plugins/jquery.alerts.css | 0 .../css/plugins/jquery.jgrowl.css | 0 .../intranet => }/css/plugins/jquery.ui.css | 0 .../css/plugins/jquery.wysiwyg.css | 0 www/css/print.css | 29 - www/css/screen.css | 238 ------- www/{themes/intranet => }/css/style.css | 23 +- .../intranet => }/fonts/droidsans-webfont.eot | Bin .../intranet => }/fonts/droidsans-webfont.svg | 0 .../intranet => }/fonts/droidsans-webfont.ttf | Bin .../fonts/droidsans-webfont.woff | Bin www/{themes/intranet => }/fonts/index.html | 0 www/{themes/intranet => }/images/arrow.png | Bin .../intranet => }/images/assets/image1.png | Bin .../images/assets/thumb/large/thumb1.png | Bin .../images/assets/thumb/large/thumb2.png | Bin .../images/assets/thumb/large/thumb3.png | Bin .../images/assets/thumb/large/thumb4.png | Bin .../images/assets/thumb/large/thumb5.png | Bin .../images/assets/thumb/large/thumb6.png | Bin .../images/assets/thumb/large/thumb7.png | Bin .../images/assets/thumb/large/thumb8.png | Bin .../images/assets/thumb/large/thumb9.png | Bin .../images/assets/thumb/medium/thumb1.png | Bin .../images/assets/thumb/medium/thumb2.png | Bin .../images/assets/thumb/medium/thumb3.png | Bin .../images/assets/thumb/medium/thumb4.png | Bin .../images/assets/thumb/medium/thumb5.png | Bin .../images/assets/thumb/medium/thumb6.png | Bin .../images/assets/thumb/medium/thumb7.png | Bin .../images/assets/thumb/medium/thumb8.png | Bin .../images/assets/thumb/medium/thumb9.png | Bin .../images/assets/thumb/small/thumb1.png | Bin .../images/assets/thumb/small/thumb2.png | Bin .../images/assets/thumb/small/thumb3.png | Bin .../images/assets/thumb/small/thumb4.png | Bin .../images/assets/thumb/small/thumb5.png | Bin .../images/assets/thumb/small/thumb6.png | Bin .../images/assets/thumb/small/thumb7.png | Bin .../images/assets/thumb/small/thumb8.png | Bin .../images/assets/thumb/small/thumb9.png | Bin www/{themes/intranet => }/images/avatar.png | Bin www/{themes/intranet => }/images/barbg.png | Bin .../intranet => }/images/bgbutton4.png | Bin .../intranet => }/images/bgbutton5.png | Bin .../intranet => }/images/blacktrans.png | Bin .../intranet => }/images/blacktrans1.png | Bin .../intranet => }/images/blacktrans2.png | Bin .../intranet => }/images/bluetrans.png | Bin .../intranet => }/images/borderwhite.png | Bin www/{themes/intranet => }/images/buttonbg.png | Bin .../intranet => }/images/buttonbg2.png | Bin .../intranet => }/images/buttonbg3.png | Bin .../intranet => }/images/buttonbg5.png | Bin .../intranet => }/images/buttonbg6.png | Bin .../images/buttons/button_black.png | Bin .../images/buttons/button_blue.png | Bin .../images/buttons/button_brown.png | Bin .../images/buttons/button_green.png | Bin .../images/buttons/button_lblue.png | Bin .../images/buttons/button_red.png | Bin .../images/buttons/button_white.png | Bin .../images/buttons/button_yellow.png | Bin .../images/colorbox/controls.png | Bin .../intranet => }/images/colorbox/loading.gif | Bin .../intranet => }/images/colorpicker.png | Bin .../images/colorpicker/Thumbs.db | Bin .../images/colorpicker/blank.gif | Bin .../colorpicker/colorpicker_background.png | Bin .../images/colorpicker/colorpicker_hex.png | Bin .../images/colorpicker/colorpicker_hsb_b.png | Bin .../images/colorpicker/colorpicker_hsb_h.png | Bin .../images/colorpicker/colorpicker_hsb_s.png | Bin .../images/colorpicker/colorpicker_indic.gif | Bin .../colorpicker/colorpicker_overlay.png | Bin .../images/colorpicker/colorpicker_rgb_b.png | Bin .../images/colorpicker/colorpicker_rgb_g.png | Bin .../images/colorpicker/colorpicker_rgb_r.png | Bin .../images/colorpicker/colorpicker_select.gif | Bin .../images/colorpicker/colorpicker_submit.png | Bin .../images/colorpicker/custom_background.png | Bin .../images/colorpicker/custom_hex.png | Bin .../images/colorpicker/custom_hsb_b.png | Bin .../images/colorpicker/custom_hsb_h.png | Bin .../images/colorpicker/custom_hsb_s.png | Bin .../images/colorpicker/custom_indic.gif | Bin .../images/colorpicker/custom_rgb_b.png | Bin .../images/colorpicker/custom_rgb_g.png | Bin .../images/colorpicker/custom_rgb_r.png | Bin .../images/colorpicker/custom_submit.png | Bin .../images/colorpicker/select.png | Bin .../images/colorpicker/select2.png | Bin .../images/colorpicker/slider.png | Bin .../images/filemanager/icons-big.png | Bin .../images/filemanager/icons-small.png | Bin .../intranet => }/images/filemanager/ql.png | Bin .../images/filemanager/spinner.gif | Bin .../images/filemanager/toolbar.png | Bin .../intranet => }/images/gradcircle.png | Bin .../intranet => }/images/headbutton.png | Bin www/{themes/intranet => }/images/help.gif | Bin .../intranet => }/images/icons/404.png | Bin .../intranet => }/images/icons/buttons.png | Bin .../intranet => }/images/icons/cal.png | Bin .../intranet => }/images/icons/calarrow.png | Bin .../intranet => }/images/icons/calendar.png | Bin .../intranet => }/images/icons/candidatos.png | Bin .../intranet => }/images/icons/close.png | Bin .../images/icons/createreport.png | Bin .../intranet => }/images/icons/dashboard.png | Bin .../intranet => }/images/icons/document.png | Bin .../intranet => }/images/icons/editor.png | Bin .../intranet => }/images/icons/elements.png | Bin .../intranet => }/images/icons/error.png | Bin .../intranet => }/images/icons/file.png | Bin .../intranet => }/images/icons/form.png | Bin .../intranet => }/images/icons/gallery.png | Bin .../intranet => }/images/icons/grid.png | Bin .../intranet => }/images/icons/hbutton.png | Bin .../intranet => }/images/icons/home.png | Bin .../intranet => }/images/icons/homesmall.png | Bin .../intranet => }/images/icons/info.png | Bin .../intranet => }/images/icons/mail.png | Bin .../intranet => }/images/icons/media.png | Bin .../intranet => }/images/icons/message.png | Bin .../images/icons/notification.png | Bin .../intranet => }/images/icons/reports.png | Bin .../images/icons/small/black/calendar.png | Bin .../images/icons/small/black/chat.png | Bin .../images/icons/small/black/check.png | Bin .../images/icons/small/black/close.png | Bin .../images/icons/small/black/contact.png | Bin .../images/icons/small/black/document.png | Bin .../images/icons/small/black/edit.png | Bin .../images/icons/small/black/mail.png | Bin .../images/icons/small/black/minus.png | Bin .../images/icons/small/black/music.png | Bin .../images/icons/small/black/people.png | Bin .../images/icons/small/black/plus.png | Bin .../images/icons/small/black/save.png | Bin .../images/icons/small/black/search.png | Bin .../images/icons/small/black/settings.png | Bin .../images/icons/small/black/star.png | Bin .../images/icons/small/black/tag.png | Bin .../images/icons/small/black/user.png | Bin .../images/icons/small/black/video.png | Bin .../images/icons/small/white/calendar.png | Bin .../images/icons/small/white/chat.png | Bin .../images/icons/small/white/check.png | Bin .../images/icons/small/white/close.png | Bin .../images/icons/small/white/contact.png | Bin .../images/icons/small/white/document.png | Bin .../images/icons/small/white/edit.png | Bin .../images/icons/small/white/mail.png | Bin .../images/icons/small/white/minus.png | Bin .../images/icons/small/white/music.png | Bin .../images/icons/small/white/people.png | Bin .../images/icons/small/white/plus.png | Bin .../images/icons/small/white/save.png | Bin .../images/icons/small/white/search.png | Bin .../images/icons/small/white/settings.png | Bin .../images/icons/small/white/star.png | Bin .../images/icons/small/white/tag.png | Bin .../images/icons/small/white/user.png | Bin .../images/icons/small/white/video.png | Bin .../intranet => }/images/icons/statistics.png | Bin .../intranet => }/images/icons/success.png | Bin .../intranet => }/images/icons/table.png | Bin .../intranet => }/images/icons/trash.png | Bin .../intranet => }/images/icons/users.png | Bin .../intranet => }/images/icons/vbutton.png | Bin .../intranet => }/images/icons/warning.png | Bin www/{themes/intranet => }/images/imghover.png | Bin .../intranet => }/images/important.gif | Bin www/{themes/intranet => }/images/info.gif | Bin .../intranet => }/images/jquery.wysiwyg.gif | Bin www/{themes/intranet => }/images/leftbg.png | Bin .../intranet => }/images/loaders/loader1.gif | Bin .../intranet => }/images/loaders/loader10.gif | Bin .../intranet => }/images/loaders/loader2.gif | Bin .../intranet => }/images/loaders/loader3.gif | Bin .../intranet => }/images/loaders/loader4.gif | Bin .../intranet => }/images/loaders/loader5.gif | Bin .../intranet => }/images/loaders/loader6.gif | Bin .../intranet => }/images/loaders/loader7.gif | Bin .../intranet => }/images/loaders/loader8.gif | Bin .../intranet => }/images/loaders/loader9.gif | Bin www/{themes/intranet => }/images/loginbox.png | Bin www/{themes/intranet => }/images/logo.png | Bin www/{themes/intranet => }/images/logo2.png | Bin .../intranet => }/images/passwordfield.png | Bin www/{themes/intranet => }/images/prevnext.png | Bin .../intranet => }/images/searchbar.png | Bin .../intranet => }/images/searchicon.png | Bin .../intranet => }/images/separator.png | Bin .../intranet => }/images/separator2.png | Bin www/{themes/intranet => }/images/sort_asc.png | Bin .../images/sort_asc_disabled.png | Bin .../intranet => }/images/sort_both.png | Bin .../intranet => }/images/sort_desc.png | Bin .../images/sort_desc_disabled.png | Bin .../intranet => }/images/tabmenubg.png | Bin .../intranet => }/images/texturebg.png | Bin www/{themes/intranet => }/images/thead.png | Bin www/{themes/intranet => }/images/title.gif | Bin www/{themes/intranet => }/images/titlebg.png | Bin www/{themes/intranet => }/images/toggle.png | Bin www/{themes/intranet => }/images/toggle2.png | Bin .../intranet => }/images/usernamefield.png | Bin .../intranet => }/images/viewdelete.png | Bin .../intranet => }/js/custom/calendar.js | 0 .../intranet => }/js/custom/dashboard.js | 0 .../intranet => }/js/custom/elements.js | 0 .../intranet => }/js/custom/gallery.js | 0 .../intranet => }/js/custom/general.js | 0 .../intranet => }/js/custom/reports.js | 0 www/{themes/intranet => }/js/custom/users.js | 0 .../js/plugins/ColumnFilterWidgets.js | 0 .../intranet => }/js/plugins/FixedHeader.js | 0 .../js/plugins/FixedHeader.min.js | 0 .../intranet => }/js/plugins/colorpicker.js | 0 .../intranet => }/js/plugins/elfinder.min.js | 0 .../intranet => }/js/plugins/excanvas.min.js | 0 .../js/plugins/fullcalendar.min.js | 0 .../js/plugins/jquery-1.7.min.js | 0 .../js/plugins/jquery-ui-1.8.16.custom.min.js | 0 .../intranet => }/js/plugins/jquery.alerts.js | 0 .../js/plugins/jquery.colorbox-min.js | 0 .../plugins/jquery.dataTables.columnFilter.js | 0 .../js/plugins/jquery.dataTables.js | 0 .../js/plugins/jquery.dataTables.min.js | 0 .../js/plugins/jquery.flot.min.js | 0 .../js/plugins/jquery.flot.pie.min.js | 0 .../js/plugins/jquery.jeditable.mini.js | 0 .../intranet => }/js/plugins/jquery.jgrowl.js | 0 .../js/plugins/jquery.validate.min.js | 0 .../js/plugins/wysiwyg/jquery.wysiwyg.js | 0 .../js/plugins/wysiwyg/wysiwyg.colorpicker.js | 0 .../js/plugins/wysiwyg/wysiwyg.cssWrap.js | 0 .../js/plugins/wysiwyg/wysiwyg.image.js | 0 .../js/plugins/wysiwyg/wysiwyg.link.js | 0 .../js/plugins/wysiwyg/wysiwyg.table.js | 0 www/protected/config/main.php | 104 +-- .../CandidatoController - copia.php | 208 ++++++ .../controllers/CandidatoController.php | 299 ++++++-- www/protected/controllers/SiteController.php | 6 +- .../extensions/PageSize/PageSize.php | 29 + www/protected/messages/config.php | 28 + www/protected/messages/es/intranet.php | 38 ++ www/protected/messages/es/zii.php | 23 + .../m120127_152205_tbl_candidatos.php | 1 + www/protected/models/Candidato.php | 56 +- ...4.0,4af9cb41e1f64636f725057634b6a44b,1.ser | Bin 0 -> 25462 bytes ...4.0,fdfc1465c1553db684e2f90f64511cd4,1.ser | Bin 0 -> 516 bytes .../runtime/gii-1.1.10-dev/FormCode.php | 5 + www/protected/views/candidato/_form.php | 257 ++++--- .../views/candidato/_formCandidatoIdioma.php | 30 - .../views/candidato/_idiomas.php | 0 .../views/candidato/_titulaciones.php | 0 www/protected/views/candidato/create.php | 22 +- www/protected/views/candidato/index.php | 139 +++- www/protected/views/candidato/update.php | 11 +- www/protected/views/layouts/column1.php | 5 - www/protected/views/layouts/column2.php | 21 - .../views/layouts/default.php | 51 +- .../views/layouts/login.php | 18 +- www/protected/views/layouts/main.php | 58 -- www/protected/views/site/contact.php | 81 --- www/protected/views/site/login.php | 51 +- www/protected/views/site/pages/about.php | 10 - .../views/site/tablero.php | 0 www/protected/views/usuario/_form.php | 97 ++- www/protected/views/usuario/_view.php | 48 +- www/protected/views/usuario/create.php | 15 +- www/protected/views/usuario/index.php | 134 +++- www/protected/views/usuario/update.php | 28 +- www/protected/views/usuario/view.php | 54 +- www/themes/intranet/views/candidato/_form.php | 168 ----- .../intranet/views/candidato/_search.php | 89 --- www/themes/intranet/views/candidato/_view.php | 66 -- www/themes/intranet/views/candidato/admin.php | 66 -- .../intranet/views/candidato/create.php | 18 - www/themes/intranet/views/candidato/index.php | 68 -- .../intranet/views/candidato/update.php | 18 - www/themes/intranet/views/candidato/view.php | 37 - www/themes/intranet/views/site/login.php | 48 -- www/themes/intranet/views/usuario/_form.php | 74 -- www/themes/intranet/views/usuario/_search.php | 39 -- www/themes/intranet/views/usuario/_view.php | 24 - www/themes/intranet/views/usuario/admin.php | 55 -- www/themes/intranet/views/usuario/create.php | 16 - www/themes/intranet/views/usuario/index.php | 62 -- www/themes/intranet/views/usuario/update.php | 26 - www/themes/intranet/views/usuario/view.php | 44 -- 309 files changed, 2442 insertions(+), 2206 deletions(-) delete mode 100644 www/css/bg.gif rename www/{themes/intranet => }/css/custom.css (90%) delete mode 100644 www/css/form.css create mode 100644 www/css/gridview.css create mode 100644 www/css/gridview2.css delete mode 100644 www/css/ie.css rename www/{themes/intranet => }/css/ie7.css (100%) rename www/{themes/intranet => }/css/ie8.css (100%) rename www/{themes/intranet => }/css/ie9.css (100%) delete mode 100644 www/css/main.css create mode 100644 www/css/pager.css rename www/{themes/intranet => }/css/plugins/colorbox.css (100%) rename www/{themes/intranet => }/css/plugins/colorpicker.css (100%) rename www/{themes/intranet => }/css/plugins/elfinder.css (100%) rename www/{themes/intranet => }/css/plugins/fullcalendar.css (100%) rename www/{themes/intranet => }/css/plugins/jquery.alerts.css (100%) rename www/{themes/intranet => }/css/plugins/jquery.jgrowl.css (100%) rename www/{themes/intranet => }/css/plugins/jquery.ui.css (100%) rename www/{themes/intranet => }/css/plugins/jquery.wysiwyg.css (100%) delete mode 100644 www/css/print.css delete mode 100644 www/css/screen.css rename www/{themes/intranet => }/css/style.css (96%) rename www/{themes/intranet => }/fonts/droidsans-webfont.eot (100%) rename www/{themes/intranet => }/fonts/droidsans-webfont.svg (100%) rename www/{themes/intranet => }/fonts/droidsans-webfont.ttf (100%) rename www/{themes/intranet => }/fonts/droidsans-webfont.woff (100%) rename www/{themes/intranet => }/fonts/index.html (100%) rename www/{themes/intranet => }/images/arrow.png (100%) rename www/{themes/intranet => }/images/assets/image1.png (100%) rename www/{themes/intranet => }/images/assets/thumb/large/thumb1.png (100%) rename www/{themes/intranet => }/images/assets/thumb/large/thumb2.png (100%) rename www/{themes/intranet => }/images/assets/thumb/large/thumb3.png (100%) rename www/{themes/intranet => }/images/assets/thumb/large/thumb4.png (100%) rename www/{themes/intranet => }/images/assets/thumb/large/thumb5.png (100%) rename www/{themes/intranet => }/images/assets/thumb/large/thumb6.png (100%) rename www/{themes/intranet => }/images/assets/thumb/large/thumb7.png (100%) rename www/{themes/intranet => }/images/assets/thumb/large/thumb8.png (100%) rename www/{themes/intranet => }/images/assets/thumb/large/thumb9.png (100%) rename www/{themes/intranet => }/images/assets/thumb/medium/thumb1.png (100%) rename www/{themes/intranet => }/images/assets/thumb/medium/thumb2.png (100%) rename www/{themes/intranet => }/images/assets/thumb/medium/thumb3.png (100%) rename www/{themes/intranet => }/images/assets/thumb/medium/thumb4.png (100%) rename www/{themes/intranet => }/images/assets/thumb/medium/thumb5.png (100%) rename www/{themes/intranet => }/images/assets/thumb/medium/thumb6.png (100%) rename www/{themes/intranet => }/images/assets/thumb/medium/thumb7.png (100%) rename www/{themes/intranet => }/images/assets/thumb/medium/thumb8.png (100%) rename www/{themes/intranet => }/images/assets/thumb/medium/thumb9.png (100%) rename www/{themes/intranet => }/images/assets/thumb/small/thumb1.png (100%) rename www/{themes/intranet => }/images/assets/thumb/small/thumb2.png (100%) rename www/{themes/intranet => }/images/assets/thumb/small/thumb3.png (100%) rename www/{themes/intranet => }/images/assets/thumb/small/thumb4.png (100%) rename www/{themes/intranet => }/images/assets/thumb/small/thumb5.png (100%) rename www/{themes/intranet => }/images/assets/thumb/small/thumb6.png (100%) rename www/{themes/intranet => }/images/assets/thumb/small/thumb7.png (100%) rename www/{themes/intranet => }/images/assets/thumb/small/thumb8.png (100%) rename www/{themes/intranet => }/images/assets/thumb/small/thumb9.png (100%) rename www/{themes/intranet => }/images/avatar.png (100%) rename www/{themes/intranet => }/images/barbg.png (100%) rename www/{themes/intranet => }/images/bgbutton4.png (100%) rename www/{themes/intranet => }/images/bgbutton5.png (100%) rename www/{themes/intranet => }/images/blacktrans.png (100%) rename www/{themes/intranet => }/images/blacktrans1.png (100%) rename www/{themes/intranet => }/images/blacktrans2.png (100%) rename www/{themes/intranet => }/images/bluetrans.png (100%) rename www/{themes/intranet => }/images/borderwhite.png (100%) rename www/{themes/intranet => }/images/buttonbg.png (100%) rename www/{themes/intranet => }/images/buttonbg2.png (100%) rename www/{themes/intranet => }/images/buttonbg3.png (100%) rename www/{themes/intranet => }/images/buttonbg5.png (100%) rename www/{themes/intranet => }/images/buttonbg6.png (100%) rename www/{themes/intranet => }/images/buttons/button_black.png (100%) rename www/{themes/intranet => }/images/buttons/button_blue.png (100%) rename www/{themes/intranet => }/images/buttons/button_brown.png (100%) rename www/{themes/intranet => }/images/buttons/button_green.png (100%) rename www/{themes/intranet => }/images/buttons/button_lblue.png (100%) rename www/{themes/intranet => }/images/buttons/button_red.png (100%) rename www/{themes/intranet => }/images/buttons/button_white.png (100%) rename www/{themes/intranet => }/images/buttons/button_yellow.png (100%) rename www/{themes/intranet => }/images/colorbox/controls.png (100%) rename www/{themes/intranet => }/images/colorbox/loading.gif (100%) rename www/{themes/intranet => }/images/colorpicker.png (100%) rename www/{themes/intranet => }/images/colorpicker/Thumbs.db (100%) rename www/{themes/intranet => }/images/colorpicker/blank.gif (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_background.png (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_hex.png (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_hsb_b.png (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_hsb_h.png (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_hsb_s.png (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_indic.gif (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_overlay.png (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_rgb_b.png (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_rgb_g.png (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_rgb_r.png (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_select.gif (100%) rename www/{themes/intranet => }/images/colorpicker/colorpicker_submit.png (100%) rename www/{themes/intranet => }/images/colorpicker/custom_background.png (100%) rename www/{themes/intranet => }/images/colorpicker/custom_hex.png (100%) rename www/{themes/intranet => }/images/colorpicker/custom_hsb_b.png (100%) rename www/{themes/intranet => }/images/colorpicker/custom_hsb_h.png (100%) rename www/{themes/intranet => }/images/colorpicker/custom_hsb_s.png (100%) rename www/{themes/intranet => }/images/colorpicker/custom_indic.gif (100%) rename www/{themes/intranet => }/images/colorpicker/custom_rgb_b.png (100%) rename www/{themes/intranet => }/images/colorpicker/custom_rgb_g.png (100%) rename www/{themes/intranet => }/images/colorpicker/custom_rgb_r.png (100%) rename www/{themes/intranet => }/images/colorpicker/custom_submit.png (100%) rename www/{themes/intranet => }/images/colorpicker/select.png (100%) rename www/{themes/intranet => }/images/colorpicker/select2.png (100%) rename www/{themes/intranet => }/images/colorpicker/slider.png (100%) rename www/{themes/intranet => }/images/filemanager/icons-big.png (100%) rename www/{themes/intranet => }/images/filemanager/icons-small.png (100%) rename www/{themes/intranet => }/images/filemanager/ql.png (100%) rename www/{themes/intranet => }/images/filemanager/spinner.gif (100%) rename www/{themes/intranet => }/images/filemanager/toolbar.png (100%) rename www/{themes/intranet => }/images/gradcircle.png (100%) rename www/{themes/intranet => }/images/headbutton.png (100%) rename www/{themes/intranet => }/images/help.gif (100%) rename www/{themes/intranet => }/images/icons/404.png (100%) rename www/{themes/intranet => }/images/icons/buttons.png (100%) rename www/{themes/intranet => }/images/icons/cal.png (100%) rename www/{themes/intranet => }/images/icons/calarrow.png (100%) rename www/{themes/intranet => }/images/icons/calendar.png (100%) rename www/{themes/intranet => }/images/icons/candidatos.png (100%) rename www/{themes/intranet => }/images/icons/close.png (100%) rename www/{themes/intranet => }/images/icons/createreport.png (100%) rename www/{themes/intranet => }/images/icons/dashboard.png (100%) rename www/{themes/intranet => }/images/icons/document.png (100%) rename www/{themes/intranet => }/images/icons/editor.png (100%) rename www/{themes/intranet => }/images/icons/elements.png (100%) rename www/{themes/intranet => }/images/icons/error.png (100%) rename www/{themes/intranet => }/images/icons/file.png (100%) rename www/{themes/intranet => }/images/icons/form.png (100%) rename www/{themes/intranet => }/images/icons/gallery.png (100%) rename www/{themes/intranet => }/images/icons/grid.png (100%) rename www/{themes/intranet => }/images/icons/hbutton.png (100%) rename www/{themes/intranet => }/images/icons/home.png (100%) rename www/{themes/intranet => }/images/icons/homesmall.png (100%) rename www/{themes/intranet => }/images/icons/info.png (100%) rename www/{themes/intranet => }/images/icons/mail.png (100%) rename www/{themes/intranet => }/images/icons/media.png (100%) rename www/{themes/intranet => }/images/icons/message.png (100%) rename www/{themes/intranet => }/images/icons/notification.png (100%) rename www/{themes/intranet => }/images/icons/reports.png (100%) rename www/{themes/intranet => }/images/icons/small/black/calendar.png (100%) rename www/{themes/intranet => }/images/icons/small/black/chat.png (100%) rename www/{themes/intranet => }/images/icons/small/black/check.png (100%) rename www/{themes/intranet => }/images/icons/small/black/close.png (100%) rename www/{themes/intranet => }/images/icons/small/black/contact.png (100%) rename www/{themes/intranet => }/images/icons/small/black/document.png (100%) rename www/{themes/intranet => }/images/icons/small/black/edit.png (100%) rename www/{themes/intranet => }/images/icons/small/black/mail.png (100%) rename www/{themes/intranet => }/images/icons/small/black/minus.png (100%) rename www/{themes/intranet => }/images/icons/small/black/music.png (100%) rename www/{themes/intranet => }/images/icons/small/black/people.png (100%) rename www/{themes/intranet => }/images/icons/small/black/plus.png (100%) rename www/{themes/intranet => }/images/icons/small/black/save.png (100%) rename www/{themes/intranet => }/images/icons/small/black/search.png (100%) rename www/{themes/intranet => }/images/icons/small/black/settings.png (100%) rename www/{themes/intranet => }/images/icons/small/black/star.png (100%) rename www/{themes/intranet => }/images/icons/small/black/tag.png (100%) rename www/{themes/intranet => }/images/icons/small/black/user.png (100%) rename www/{themes/intranet => }/images/icons/small/black/video.png (100%) rename www/{themes/intranet => }/images/icons/small/white/calendar.png (100%) rename www/{themes/intranet => }/images/icons/small/white/chat.png (100%) rename www/{themes/intranet => }/images/icons/small/white/check.png (100%) rename www/{themes/intranet => }/images/icons/small/white/close.png (100%) rename www/{themes/intranet => }/images/icons/small/white/contact.png (100%) rename www/{themes/intranet => }/images/icons/small/white/document.png (100%) rename www/{themes/intranet => }/images/icons/small/white/edit.png (100%) rename www/{themes/intranet => }/images/icons/small/white/mail.png (100%) rename www/{themes/intranet => }/images/icons/small/white/minus.png (100%) rename www/{themes/intranet => }/images/icons/small/white/music.png (100%) rename www/{themes/intranet => }/images/icons/small/white/people.png (100%) rename www/{themes/intranet => }/images/icons/small/white/plus.png (100%) rename www/{themes/intranet => }/images/icons/small/white/save.png (100%) rename www/{themes/intranet => }/images/icons/small/white/search.png (100%) rename www/{themes/intranet => }/images/icons/small/white/settings.png (100%) rename www/{themes/intranet => }/images/icons/small/white/star.png (100%) rename www/{themes/intranet => }/images/icons/small/white/tag.png (100%) rename www/{themes/intranet => }/images/icons/small/white/user.png (100%) rename www/{themes/intranet => }/images/icons/small/white/video.png (100%) rename www/{themes/intranet => }/images/icons/statistics.png (100%) rename www/{themes/intranet => }/images/icons/success.png (100%) rename www/{themes/intranet => }/images/icons/table.png (100%) rename www/{themes/intranet => }/images/icons/trash.png (100%) rename www/{themes/intranet => }/images/icons/users.png (100%) rename www/{themes/intranet => }/images/icons/vbutton.png (100%) rename www/{themes/intranet => }/images/icons/warning.png (100%) rename www/{themes/intranet => }/images/imghover.png (100%) rename www/{themes/intranet => }/images/important.gif (100%) rename www/{themes/intranet => }/images/info.gif (100%) rename www/{themes/intranet => }/images/jquery.wysiwyg.gif (100%) rename www/{themes/intranet => }/images/leftbg.png (100%) rename www/{themes/intranet => }/images/loaders/loader1.gif (100%) rename www/{themes/intranet => }/images/loaders/loader10.gif (100%) rename www/{themes/intranet => }/images/loaders/loader2.gif (100%) rename www/{themes/intranet => }/images/loaders/loader3.gif (100%) rename www/{themes/intranet => }/images/loaders/loader4.gif (100%) rename www/{themes/intranet => }/images/loaders/loader5.gif (100%) rename www/{themes/intranet => }/images/loaders/loader6.gif (100%) rename www/{themes/intranet => }/images/loaders/loader7.gif (100%) rename www/{themes/intranet => }/images/loaders/loader8.gif (100%) rename www/{themes/intranet => }/images/loaders/loader9.gif (100%) rename www/{themes/intranet => }/images/loginbox.png (100%) rename www/{themes/intranet => }/images/logo.png (100%) rename www/{themes/intranet => }/images/logo2.png (100%) rename www/{themes/intranet => }/images/passwordfield.png (100%) rename www/{themes/intranet => }/images/prevnext.png (100%) rename www/{themes/intranet => }/images/searchbar.png (100%) rename www/{themes/intranet => }/images/searchicon.png (100%) rename www/{themes/intranet => }/images/separator.png (100%) rename www/{themes/intranet => }/images/separator2.png (100%) rename www/{themes/intranet => }/images/sort_asc.png (100%) rename www/{themes/intranet => }/images/sort_asc_disabled.png (100%) rename www/{themes/intranet => }/images/sort_both.png (100%) rename www/{themes/intranet => }/images/sort_desc.png (100%) rename www/{themes/intranet => }/images/sort_desc_disabled.png (100%) rename www/{themes/intranet => }/images/tabmenubg.png (100%) rename www/{themes/intranet => }/images/texturebg.png (100%) rename www/{themes/intranet => }/images/thead.png (100%) rename www/{themes/intranet => }/images/title.gif (100%) rename www/{themes/intranet => }/images/titlebg.png (100%) rename www/{themes/intranet => }/images/toggle.png (100%) rename www/{themes/intranet => }/images/toggle2.png (100%) rename www/{themes/intranet => }/images/usernamefield.png (100%) rename www/{themes/intranet => }/images/viewdelete.png (100%) rename www/{themes/intranet => }/js/custom/calendar.js (100%) rename www/{themes/intranet => }/js/custom/dashboard.js (100%) rename www/{themes/intranet => }/js/custom/elements.js (100%) rename www/{themes/intranet => }/js/custom/gallery.js (100%) rename www/{themes/intranet => }/js/custom/general.js (100%) rename www/{themes/intranet => }/js/custom/reports.js (100%) rename www/{themes/intranet => }/js/custom/users.js (100%) rename www/{themes/intranet => }/js/plugins/ColumnFilterWidgets.js (100%) rename www/{themes/intranet => }/js/plugins/FixedHeader.js (100%) rename www/{themes/intranet => }/js/plugins/FixedHeader.min.js (100%) rename www/{themes/intranet => }/js/plugins/colorpicker.js (100%) rename www/{themes/intranet => }/js/plugins/elfinder.min.js (100%) rename www/{themes/intranet => }/js/plugins/excanvas.min.js (100%) rename www/{themes/intranet => }/js/plugins/fullcalendar.min.js (100%) rename www/{themes/intranet => }/js/plugins/jquery-1.7.min.js (100%) rename www/{themes/intranet => }/js/plugins/jquery-ui-1.8.16.custom.min.js (100%) rename www/{themes/intranet => }/js/plugins/jquery.alerts.js (100%) rename www/{themes/intranet => }/js/plugins/jquery.colorbox-min.js (100%) rename www/{themes/intranet => }/js/plugins/jquery.dataTables.columnFilter.js (100%) rename www/{themes/intranet => }/js/plugins/jquery.dataTables.js (100%) rename www/{themes/intranet => }/js/plugins/jquery.dataTables.min.js (100%) rename www/{themes/intranet => }/js/plugins/jquery.flot.min.js (100%) rename www/{themes/intranet => }/js/plugins/jquery.flot.pie.min.js (100%) rename www/{themes/intranet => }/js/plugins/jquery.jeditable.mini.js (100%) rename www/{themes/intranet => }/js/plugins/jquery.jgrowl.js (100%) rename www/{themes/intranet => }/js/plugins/jquery.validate.min.js (100%) rename www/{themes/intranet => }/js/plugins/wysiwyg/jquery.wysiwyg.js (100%) rename www/{themes/intranet => }/js/plugins/wysiwyg/wysiwyg.colorpicker.js (100%) rename www/{themes/intranet => }/js/plugins/wysiwyg/wysiwyg.cssWrap.js (100%) rename www/{themes/intranet => }/js/plugins/wysiwyg/wysiwyg.image.js (100%) rename www/{themes/intranet => }/js/plugins/wysiwyg/wysiwyg.link.js (100%) rename www/{themes/intranet => }/js/plugins/wysiwyg/wysiwyg.table.js (100%) create mode 100644 www/protected/controllers/CandidatoController - copia.php create mode 100644 www/protected/extensions/PageSize/PageSize.php create mode 100644 www/protected/messages/config.php create mode 100644 www/protected/messages/es/intranet.php create mode 100644 www/protected/messages/es/zii.php create mode 100644 www/protected/runtime/CSS/4.4.0,4af9cb41e1f64636f725057634b6a44b,1.ser create mode 100644 www/protected/runtime/URI/4.4.0,fdfc1465c1553db684e2f90f64511cd4,1.ser create mode 100644 www/protected/runtime/gii-1.1.10-dev/FormCode.php delete mode 100644 www/protected/views/candidato/_formCandidatoIdioma.php rename www/{themes/intranet => protected}/views/candidato/_idiomas.php (100%) rename www/{themes/intranet => protected}/views/candidato/_titulaciones.php (100%) delete mode 100644 www/protected/views/layouts/column1.php delete mode 100644 www/protected/views/layouts/column2.php rename www/{themes/intranet => protected}/views/layouts/default.php (72%) rename www/{themes/intranet => protected}/views/layouts/login.php (58%) delete mode 100644 www/protected/views/layouts/main.php delete mode 100644 www/protected/views/site/contact.php delete mode 100644 www/protected/views/site/pages/about.php rename www/{themes/intranet => protected}/views/site/tablero.php (100%) delete mode 100644 www/themes/intranet/views/candidato/_form.php delete mode 100644 www/themes/intranet/views/candidato/_search.php delete mode 100644 www/themes/intranet/views/candidato/_view.php delete mode 100644 www/themes/intranet/views/candidato/admin.php delete mode 100644 www/themes/intranet/views/candidato/create.php delete mode 100644 www/themes/intranet/views/candidato/index.php delete mode 100644 www/themes/intranet/views/candidato/update.php delete mode 100644 www/themes/intranet/views/candidato/view.php delete mode 100644 www/themes/intranet/views/site/login.php delete mode 100644 www/themes/intranet/views/usuario/_form.php delete mode 100644 www/themes/intranet/views/usuario/_search.php delete mode 100644 www/themes/intranet/views/usuario/_view.php delete mode 100644 www/themes/intranet/views/usuario/admin.php delete mode 100644 www/themes/intranet/views/usuario/create.php delete mode 100644 www/themes/intranet/views/usuario/index.php delete mode 100644 www/themes/intranet/views/usuario/update.php delete mode 100644 www/themes/intranet/views/usuario/view.php diff --git a/www/css/bg.gif b/www/css/bg.gif deleted file mode 100644 index 428398973e1a8a6a1129d9332da6714e59bedba4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmZ?wbhEHbWMeR5IKlt||Ns9Fn|mU0@#)m1XEK+c^_h9pch)ig*~bFs91EU%JYxQd z=mjU^7M;pmaW-ewx%@Tfi`HEz-EgsD1pFZrjzSo!1+8Tx;5Kt##K8 zpn+h6L4@K@7DfgJ83r8?2V^G$YrzAxzKG1Mj9F{fJlz+r6JFwb_s5d=LGRrUD5QAQ zNc8tDnRFnBZ{CHrl2a?9#BZ!gI2~HCzjK3xqn`Y^jOMDdVT&(5-4yZXZ_&=1Ypz<& pbz11_%i7%H?(X8^=xAqWZEay;YHDPpudkz{si~%>tgOgj4FL3OZcYFI diff --git a/www/themes/intranet/css/custom.css b/www/css/custom.css similarity index 90% rename from www/themes/intranet/css/custom.css rename to www/css/custom.css index e6271bc..a179b3e 100644 --- a/www/themes/intranet/css/custom.css +++ b/www/css/custom.css @@ -19,7 +19,7 @@ span.timestamp { padding-right: 5px; } -.borrador { +.borrador, .estado0 { background: none repeat scroll 0 0 #FF9C00; border-radius: 5px 5px 5px 5px; color: #FFFFFF; @@ -53,8 +53,8 @@ span.timestamp { cursor: pointer; } -.gris { - color: #999; +.nodata { + color: #999; } diff --git a/www/css/form.css b/www/css/form.css deleted file mode 100644 index b194603..0000000 --- a/www/css/form.css +++ /dev/null @@ -1,160 +0,0 @@ -/** - * CSS styles for forms generated by yiic. - * - * The styles can be applied to the following form structure: - * - *
- *
- * - * - *

hint text

- *
- *
- * - * - *

hint text

- *
- *
- * - * - *

hint text

- *
- *
- * - * The above code will render the labels and input fields in separate lines. - * In order to render them in the same line, please use the "wide" form as follows, - * - *
- * ...... - *
- * - * @author Qiang Xue - * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008-2010 Yii Software LLC - * @license http://www.yiiframework.com/license/ - */ - -div.form -{ -} - -div.form input, -div.form textarea, -div.form select -{ - margin: 0.2em 0 0.5em 0; -} - -div.form fieldset -{ - border: 1px solid #DDD; - padding: 10px; - margin: 0 0 10px 0; - -moz-border-radius:7px; -} - -div.form label -{ - font-weight: bold; - font-size: 0.9em; - display: block; -} - -div.form .row -{ - margin: 5px 0; -} - -div.form .hint -{ - margin: 0; - padding: 0; - color: #999; -} - -div.form .note -{ - font-style: italic; -} - -div.form span.required -{ - color: red; -} - -div.form div.error label:first-child, -div.form label.error, -div.form span.error -{ - color: #C00; -} - -div.form div.error input, -div.form div.error textarea, -div.form div.error select, -div.form input.error, -div.form textarea.error, -div.form select.error -{ - background: #FEE; - border-color: #C00; -} - -div.form div.success input, -div.form div.success textarea, -div.form div.success select, -div.form input.success, -div.form textarea.success, -div.form select.success -{ - background: #E6EFC2; - border-color: #C6D880; -} - - -div.form .errorSummary -{ - border: 2px solid #C00; - padding: 7px 7px 12px 7px; - margin: 0 0 20px 0; - background: #FEE; - font-size: 0.9em; -} - -div.form .errorMessage -{ - color: red; - font-size: 0.9em; -} - -div.form .errorSummary p -{ - margin: 0; - padding: 5px; -} - -div.form .errorSummary ul -{ - margin: 0; - padding: 0 0 0 20px; -} - -div.wide.form label -{ - float: left; - margin-right: 10px; - position: relative; - text-align: right; - width: 100px; -} - -div.wide.form .row -{ - clear: left; -} - -div.wide.form .buttons, div.wide.form .hint, div.wide.form .errorMessage -{ - clear: left; - padding-left: 110px; -} diff --git a/www/css/gridview.css b/www/css/gridview.css new file mode 100644 index 0000000..44dd706 --- /dev/null +++ b/www/css/gridview.css @@ -0,0 +1,638 @@ +/* + * File: demo_table_jui.css + * CVS: $Id$ + * Description: CSS descriptions for DataTables demo pages + * Author: Allan Jardine + * Created: Tue May 12 06:47:22 BST 2009 + * Modified: $Date$ by $Author$ + * Language: CSS + * Project: DataTables + * + * Copyright 2009 Allan Jardine. All Rights Reserved. + * + * *************************************************************************** + * DESCRIPTION + * + * The styles given here are suitable for the demos that are used with the standard DataTables + * distribution (see www.datatables.net). You will most likely wish to modify these styles to + * meet the layout requirements of your site. + * + * Common issues: + * 'full_numbers' pagination - I use an extra selector on the body tag to ensure that there is + * no conflict between the two pagination types. If you want to use full_numbers pagination + * ensure that you either have "example_alt_pagination" as a body class name, or better yet, + * modify that selector. + * Note that the path used for Images is relative. All images are by default located in + * ../images/ - relative to this CSS file. + */ + + +/* + * jQuery UI specific styling + */ + +/*.paging_two_button .ui-button { + float: left; + cursor: pointer; + * cursor: hand; +}*/ + +/*.paging_full_numbers .ui-button { + padding: 2px 6px; + margin: 0; + cursor: pointer; + * cursor: hand; + color: #333 !important; +}*/ + +/*.dataTables_paginate .ui-button { + margin-right: -0.1em !important; +} + +.paging_full_numbers { + width: 350px !important; +}*/ + +.dataTables_wrapper .ui-toolbar { + padding: 5px; +} + +/*.dataTables_paginate { + width: auto; +}*/ + +.dataTables_info { + padding: 10px; +} + +table.display thead th { + padding: 3px 0px 3px 10px; + cursor: pointer; + * cursor: hand; +} + +div.dataTables_wrapper .ui-widget-header { + font-weight: normal; +} + + +/* + * Sort arrow icon positioning + */ +table.display thead th div.DataTables_sort_wrapper { + position: relative; + padding-right: 20px; + padding-right: 20px; +} + +table.display thead th div.DataTables_sort_wrapper span { + position: absolute; + top: 50%; + margin-top: -8px; + right: 0; +} + + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Everything below this line is the same as demo_table.css. This file is + * required for 'cleanliness' of the markup + * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * DataTables features + */ + +.dataTables_wrapper { + background: url("../images/thead.png") repeat-x scroll left top #EEEEEE; + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + position: relative; +} + +.dataTables_processing { + position: absolute; + top: 0px; + left: 50%; + width: 250px; + margin-left: -125px; + border: 1px solid #ddd; + text-align: center; + color: #999; + font-size: 11px; + padding: 2px 0; +} + +.dataTables_length { + padding: 10px; +} + +.dataTables_toolbar { + width: auto; + margin-left: 2em; + float: right; + text-align: right; +} + +.dataTables_filter { + position: absolute; + right: 5px; + top: 11px; +} + +.dataTables_info { + +} + +.dataTables_paginate { + bottom: 7px; + position: absolute; + right: 8px; +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Pagination + */ + +.paging_full_numbers { + position: absolute; + bottom: 7px; + right: 8px; +} + +.paging_full_numbers .ui-button { + display: inline-block; + padding: 2px 8px; + border: 1px solid #ccc; + margin-left: 5px; + background: #eee url(../images/buttonbg5.png) repeat-x top left; + cursor: pointer; + -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; +} + +.paging_full_numbers .ui-button:hover { + background: #eee; + -moz-box-shadow: inset 1px 1px 2px #ccc; -webkit-box-shadow: inset 1px 1px 2px #ccc; + box-shadow: inset 1px 1px 2px #ccc; +} + +.paging_full_numbers .paginate_active, .paging_full_numbers .ui-button:active { + display: inline-block; padding: 2px 8px; border: 1px solid #405A87; margin-left: 5px; + background: #405A87 url(../images/buttonbg3.png) repeat-x top left; color: #fff; + -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; +} + +.paging_full_numbers .ui-state-disabled { + color: #999; +} + + +.paginate_disabled_previous, .paginate_enabled_previous, .paginate_disabled_next, .paginate_enabled_next { + height: 19px; + width: 19px; + margin-left: 3px; + float: left; +} + +.paginate_disabled_previous { + background-image: url('../images/back_disabled.jpg'); +} + +.paginate_enabled_previous { + background-image: url('../images/back_enabled.jpg'); +} + +.paginate_disabled_next { + background-image: url('../images/forward_disabled.jpg'); +} + +.paginate_enabled_next { + background-image: url('../images/forward_enabled.jpg'); +} + +.paging_full_numbers a.paginate_button, +.paging_full_numbers a.paginate_active { + border: 1px solid #aaa; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + padding: 2px 5px; + margin: 0 3px; + cursor: pointer; + *cursor: hand; + color: #333 !important; +} + +.paging_full_numbers a.paginate_button { + background-color: #ddd; +} + +.paging_full_numbers a.paginate_button:hover { + background-color: #ccc; + text-decoration: none !important; +} + +.paging_full_numbers a.paginate_active { + background-color: #99B3FF; +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * DataTables display + */ +table.display { + width: 100%; + background: #fcfcfc; + border-collapse: collapse; + border: none; + margin: 0 auto; + clear: both; +} + +table.display thead th, table.display tfoot td { + padding: 5px 10px; + color: #fff; + font-weight: normal; + text-align: left; + background-color: #666; +} + +table.display thead th a, table.display tfoot td a { + color: #fff; +} + +table.display tr.heading2 td { + border-bottom: 1px solid #aaa; +} + +table.display tr:first-child td { + border-top: 0; +} + +table.display tr td { + padding: 5px 10px; + border-top: 1px solid #ddd; +} + +table.display td.center { + text-align: center; +} + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * DataTables sorting + */ + +.sorting_asc { + background-image: url(../images/sort_asc.png); + background-repeat: no-repeat; + background-position: right 6px; +} + +.sorting_desc { + background-image: url(../images/sort_desc.png); + background-repeat: no-repeat; + background-position: right 6px; +} + +.sorting { + background-image: url(../images/sort_both.png); + background-repeat: no-repeat; + background-position: right 5px; +} + +.sorting_asc_disabled { + background: none; +} + +.sorting_desc_disabled { + background: none; +} + + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * DataTables row classes + */ +table.display tr.odd.gradeA { + background-color: #ddffdd; +} + +table.display tr.even.gradeA { + background-color: #eeffee; +} + + + + +table.display tr.odd.gradeA { + background-color: #ddffdd; +} + +table.display tr.even.gradeA { + background-color: #eeffee; +} + +table.display tr.odd.gradeC { + background-color: #ddddff; +} + +table.display tr.even.gradeC { + background-color: #eeeeff; +} + +table.display tr.odd.gradeX { + background-color: #ffdddd; +} + +table.display tr.even.gradeX { + background-color: #ffeeee; +} + +table.display tr.odd.gradeU { + background-color: #ddd; +} + +table.display tr.even.gradeU { + background-color: #eee; +} + + +tr.odd { + +} + +tr.even { + background: #eee; +} + + + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Misc + */ +.dataTables_scroll { + clear: both; +} + +.top, .bottom { + padding: 15px; + background-color: #F5F5F5; + border: 1px solid #CCCCCC; +} + +.top .dataTables_info { + float: none; +} + +.dataTables_empty { + text-align: center; +} + +tfoot input { + margin: 0.5em 0; + width: 100%; + color: #444; +} + +tfoot input.search_init { + color: #999; +} + +td.group { + background-color: #d1cfd0; + border-bottom: 2px solid #A19B9E; + border-top: 2px solid #A19B9E; +} + +td.details { + background-color: #d1cfd0; + border: 2px solid #A19B9E; +} + + +.example_alt_pagination div.dataTables_info { + width: 40%; +} + + + +table.display tr.even.row_selected td { + background-color: #B0BED9; +} + +table.display tr.odd.row_selected td { + background-color: #9FAFD1; +} + + +/* + * Sorting classes for columns + */ +/* For the standard odd/even */ +tr.odd td.sorting_1 { + background: #f7f7f7; +} + +tr.odd td.sorting_2 { + background: #f7f7f7; +} + +tr.odd td.sorting_3 { + background: #f7f7f7; +} + +tr.even td.sorting_1 { + background: #eee; +} + +tr.even td.sorting_2 { + background: #eee; +} + +tr.even td.sorting_3 { + background: #eee; +} + + +/* For the Conditional-CSS grading rows */ +/* + Colour calculations (based off the main row colours) + Level 1: + dd > c4 + ee > d5 + Level 2: + dd > d1 + ee > e2 + */ +tr.odd.gradeA td.sorting_1 { + background-color: #c4ffc4; +} + +tr.odd.gradeA td.sorting_2 { + background-color: #d1ffd1; +} + +tr.odd.gradeA td.sorting_3 { + background-color: #d1ffd1; +} + +tr.even.gradeA td.sorting_1 { + background-color: #d5ffd5; +} + +tr.even.gradeA td.sorting_2 { + background-color: #e2ffe2; +} + +tr.even.gradeA td.sorting_3 { + background-color: #e2ffe2; +} + +tr.odd.gradeC td.sorting_1 { + background-color: #c4c4ff; +} + +tr.odd.gradeC td.sorting_2 { + background-color: #d1d1ff; +} + +tr.odd.gradeC td.sorting_3 { + background-color: #d1d1ff; +} + +tr.even.gradeC td.sorting_1 { + background-color: #d5d5ff; +} + +tr.even.gradeC td.sorting_2 { + background-color: #e2e2ff; +} + +tr.even.gradeC td.sorting_3 { + background-color: #e2e2ff; +} + +tr.odd.gradeX td.sorting_1 { + background-color: #ffc4c4; +} + +tr.odd.gradeX td.sorting_2 { + background-color: #ffd1d1; +} + +tr.odd.gradeX td.sorting_3 { + background-color: #ffd1d1; +} + +tr.even.gradeX td.sorting_1 { + background-color: #ffd5d5; +} + +tr.even.gradeX td.sorting_2 { + background-color: #ffe2e2; +} + +tr.even.gradeX td.sorting_3 { + background-color: #ffe2e2; +} + +tr.odd.gradeU td.sorting_1 { + background-color: #c4c4c4; +} + +tr.odd.gradeU td.sorting_2 { + background-color: #d1d1d1; +} + +tr.odd.gradeU td.sorting_3 { + background-color: #d1d1d1; +} + +tr.even.gradeU td.sorting_1 { + background-color: #d5d5d5; +} + +tr.even.gradeU td.sorting_2 { + background-color: #e2e2e2; +} + +tr.even.gradeU td.sorting_3 { + background-color: #e2e2e2; +} + + +/* + * Row highlighting example + */ +.ex_highlight #example tbody tr.even:hover, #example tbody tr.even td.highlighted { + background-color: #ECFFB3; +} + +.ex_highlight #example tbody tr.odd:hover, #example tbody tr.odd td.highlighted { + background-color: #E6FF99; +} + + + + + + + + + + + + + + + + + + + + +.dataTables_wrapper label { + display: inline-block; + margin-right: 5px; +} + +/** paginacion **/ +/* +.paging_full_numbers .paginate_button:hover { + background: #eee; -moz-box-shadow: inset 1px 1px 2px #ccc; -webkit-box-shadow: inset 1px 1px 2px #ccc; + box-shadow: inset 1px 1px 2px #ccc; +} +.paging_full_numbers .paginate_active, .paging_full_numbers .paginate_button:active { + display: inline-block; padding: 2px 8px; border: 1px solid #405A87; margin-left: 5px; + background: #405A87 url(../images/buttonbg3.png) repeat-x top left; color: #fff; + -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; +} +.paging_full_numbers .paginate_button_disabled { color: #999; }*/ + + +/*.grid-view label { display: inline-block; margin-right: 5px; }*/ +/*.items { } +.items thead th, .items tfoot td { } +.items thead th a, .items tfoot td a { } +.items thead th, .items tfoot td { } +.items thead th.head0, .items tfoot td.head0 { background: #666; } +.items thead th.head1, .items tfoot td.head1 { background: #555; } +.items tbody tr td { } +.items tbody tr:first-child td { } +.items .con1 { background: #eee; } +.items .con0 { background: #f7f7f7; } +.items .odd { } +.items .even { } +.items thead th.sorting { } +.items thead th.sorting_asc { } +.items thead th.sorting_desc { }*/ + +/*.summary { padding: 10px; }*/ \ No newline at end of file diff --git a/www/css/gridview2.css b/www/css/gridview2.css new file mode 100644 index 0000000..ac265d0 --- /dev/null +++ b/www/css/gridview2.css @@ -0,0 +1,367 @@ +/* + * File: demo_table_jui.css + * CVS: $Id$ + * Description: CSS descriptions for DataTables demo pages + * Author: Allan Jardine + * Created: Tue May 12 06:47:22 BST 2009 + * Modified: $Date$ by $Author$ + * Language: CSS + * Project: DataTables + * + * Copyright 2009 Allan Jardine. All Rights Reserved. + * + * *************************************************************************** + * DESCRIPTION + * + * The styles given here are suitable for the demos that are used with the standard DataTables + * distribution (see www.datatables.net). You will most likely wish to modify these styles to + * meet the layout requirements of your site. + * + * Common issues: + * 'full_numbers' pagination - I use an extra selector on the body tag to ensure that there is + * no conflict between the two pagination types. If you want to use full_numbers pagination + * ensure that you either have "example_alt_pagination" as a body class name, or better yet, + * modify that selector. + * Note that the path used for Images is relative. All images are by default located in + * ../images/ - relative to this CSS file. + */ + + +/* + * jQuery UI specific styling + */ + +/*.paging_two_button .ui-button { + float: left; + cursor: pointer; + * cursor: hand; +}*/ + +/*.paging_full_numbers .ui-button { + padding: 2px 6px; + margin: 0; + cursor: pointer; + * cursor: hand; + color: #333 !important; +}*/ + +/*.dataTables_paginate .ui-button { + margin-right: -0.1em !important; +} + +.paging_full_numbers { + width: 350px !important; +}*/ + +.dataTables_wrapper .ui-toolbar { + padding: 5px; +} + +/*.dataTables_paginate { + width: auto; +}*/ + +.dataTables_info { + padding: 10px; +} + +table.display thead th { + padding: 3px 0px 3px 10px; + cursor: pointer; + * cursor: hand; +} + +div.dataTables_wrapper .ui-widget-header { + font-weight: normal; +} + + +/* + * Sort arrow icon positioning + */ +table.display thead th div.DataTables_sort_wrapper { + position: relative; + padding-right: 20px; + padding-right: 20px; +} + +table.display thead th div.DataTables_sort_wrapper span { + position: absolute; + top: 50%; + margin-top: -8px; + right: 0; +} + + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Everything below this line is the same as demo_table.css. This file is + * required for 'cleanliness' of the markup + * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * DataTables features + */ + +.dataTables_wrapper { + background: url("../images/thead.png") repeat-x scroll left top #EEEEEE; + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + position: relative; +} + +.dataTables_processing { + position: absolute; + top: 0px; + left: 50%; + width: 250px; + margin-left: -125px; + border: 1px solid #ddd; + text-align: center; + color: #999; + font-size: 11px; + padding: 2px 0; +} + +.dataTables_length { + padding: 10px; +} + +.dataTables_toolbar { + width: auto; + margin-left: 2em; + float: right; + text-align: right; +} + +.dataTables_filter { + position: absolute; + right: 5px; + top: 11px; +} + +.dataTables_info { +} + +.dataTables_paginate { + bottom: 7px; + position: absolute; + right: 8px; +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * DataTables display + */ +table.display { + width: 100%; + background: #fcfcfc; + border-collapse: collapse; + border: none; + margin: 0 auto; + clear: both; +} + +table.display thead th, table.display tfoot td { + padding: 5px 0px 5px 10px; + color: #fff; + font-weight: normal; + text-align: left; + background-color: #666; +} + +table.display thead th a, table.display tfoot td a { + color: #fff; +} + +table.display thead th a { + color: #fff; + display: block; +} + +table.display thead th.head0, table.display tfoot td.head0 { background-color: #666; } +table.display thead th.head1, table.display tfoot td.head1 { background-color: #555; } + + +table.display tr.heading2 td { + border-bottom: 1px solid #aaa; +} + +table.display tr:first-child td { + border-top: 0; +} + +table.display tr td { + padding: 5px 10px; + border-top: 1px solid #ddd; +} + +table.display td.center { + text-align: center; +} + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * DataTables sorting + */ + + table.display thead th a { + background-image: url(../images/sort_both.png); + background-repeat: no-repeat; + background-position: right 1px; +} + +table.display thead th a.asc { + background-image: url(../images/sort_asc.png); + background-repeat: no-repeat; + background-position: right 2px; +} + +table.display thead th a.desc { + background-image: url(../images/sort_desc.png); + background-repeat: no-repeat; + background-position: right 2px; +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * DataTables row classes + */ + +tr.odd { + +} + +tr.even { + background-color: #eee; +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * DataTables cells classes + */ + +td.con1 { background-color: #eee; } +td.con0 { background-color: #f7f7f7; } + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Misc + */ +.dataTables_scroll { + clear: both; +} + +.top, .bottom { + +} + +.top .dataTables_info { + float: none; +} + +.dataTables_empty { + text-align: center; +} + +tfoot input { + margin: 0.5em 0; + width: 100%; + color: #444; +} + +tfoot input.search_init { + color: #999; +} + +td.group { + background-color: #d1cfd0; + border-bottom: 2px solid #A19B9E; + border-top: 2px solid #A19B9E; +} + +td.details { + background-color: #d1cfd0; + border: 2px solid #A19B9E; +} + + +table.display tr.even.row_selected td { + background-color: #B0BED9; +} + +table.display tr.odd.row_selected td { + background-color: #9FAFD1; +} + + +/* + * Sorting classes for columns + */ +/* For the standard odd/even */ +tr.odd td.sorting_1 { + background: #f7f7f7; +} + +tr.odd td.sorting_2 { + background: #f7f7f7; +} + +tr.odd td.sorting_3 { + background: #f7f7f7; +} + +tr.even td.sorting_1 { + background: #eee; +} + +tr.even td.sorting_2 { + background: #eee; +} + +tr.even td.sorting_3 { + background: #eee; +} + + + +.dataTables_wrapper label { + display: inline-block; + margin-right: 5px; +} + +/** paginacion **/ +/* +.paging_full_numbers .paginate_button:hover { + background: #eee; -moz-box-shadow: inset 1px 1px 2px #ccc; -webkit-box-shadow: inset 1px 1px 2px #ccc; + box-shadow: inset 1px 1px 2px #ccc; +} +.paging_full_numbers .paginate_active, .paging_full_numbers .paginate_button:active { + display: inline-block; padding: 2px 8px; border: 1px solid #405A87; margin-left: 5px; + background: #405A87 url(../images/buttonbg3.png) repeat-x top left; color: #fff; + -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; +} +.paging_full_numbers .paginate_button_disabled { color: #999; }*/ + + +/*.grid-view label { display: inline-block; margin-right: 5px; }*/ +/*.items { } +.items thead th, .items tfoot td { } +.items thead th a, .items tfoot td a { } +.items thead th, .items tfoot td { } +.items thead th.head0, .items tfoot td.head0 { background: #666; } +.items thead th.head1, .items tfoot td.head1 { background: #555; } +.items tbody tr td { } +.items tbody tr:first-child td { } +.items .con1 { background: #eee; } +.items .con0 { background: #f7f7f7; } +.items .odd { } +.items .even { } +.items thead th.sorting { } +.items thead th.sorting_asc { } +.items thead th.sorting_desc { }*/ + +/*.summary { padding: 10px; }*/ \ No newline at end of file diff --git a/www/css/ie.css b/www/css/ie.css deleted file mode 100644 index f015399..0000000 --- a/www/css/ie.css +++ /dev/null @@ -1,36 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 1.0.1 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* ie.css */ -body {text-align:center;} -.container {text-align:left;} -* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;} -* html legend {margin:0px -8px 16px 0;padding:0;} -sup {vertical-align:text-top;} -sub {vertical-align:text-bottom;} -html>body p code {*white-space:normal;} -hr {margin:-8px auto 11px;} -img {-ms-interpolation-mode:bicubic;} -.clearfix, .container {display:inline-block;} -* html .clearfix, * html .container {height:1%;} -fieldset {padding-top:0;} -legend {margin-top:-0.2em;margin-bottom:1em;margin-left:-0.5em;} -textarea {overflow:auto;} -label {vertical-align:middle;position:relative;top:-0.25em;} -input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;} -input.text:focus, input.title:focus {border-color:#666;} -input.text, input.title, textarea, select {margin:0.5em 0;} -input.checkbox, input.radio {position:relative;top:.25em;} -form.inline div, form.inline p {vertical-align:middle;} -form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;} -button, input.button {position:relative;top:0.25em;} \ No newline at end of file diff --git a/www/themes/intranet/css/ie7.css b/www/css/ie7.css similarity index 100% rename from www/themes/intranet/css/ie7.css rename to www/css/ie7.css diff --git a/www/themes/intranet/css/ie8.css b/www/css/ie8.css similarity index 100% rename from www/themes/intranet/css/ie8.css rename to www/css/ie8.css diff --git a/www/themes/intranet/css/ie9.css b/www/css/ie9.css similarity index 100% rename from www/themes/intranet/css/ie9.css rename to www/css/ie9.css diff --git a/www/css/main.css b/www/css/main.css deleted file mode 100644 index 13327b8..0000000 --- a/www/css/main.css +++ /dev/null @@ -1,229 +0,0 @@ -body -{ - margin: 0; - padding: 0; - color: #555; - font: normal 10pt Arial,Helvetica,sans-serif; - background: #EFEFEF; -} - -#page -{ - margin-top: 5px; - margin-bottom: 5px; - background: white; - border: 1px solid #C9E0ED; -} - -#header -{ - margin: 0; - padding: 0; - border-top: 3px solid #C9E0ED; -} - -#content -{ - padding: 20px; -} - -#sidebar -{ - padding: 20px 20px 20px 0; -} - -#footer -{ - padding: 10px; - margin: 10px 20px; - font-size: 0.8em; - text-align: center; - border-top: 1px solid #C9E0ED; -} - -#logo -{ - padding: 10px 20px; - font-size: 200%; -} - -#mainmenu -{ - background:white url(bg.gif) repeat-x left top; -} - -#mainmenu ul -{ - padding:6px 20px 5px 20px; - margin:0px; -} - -#mainmenu ul li -{ - display: inline; -} - -#mainmenu ul li a -{ - color:#ffffff; - background-color:transparent; - font-size:12px; - font-weight:bold; - text-decoration:none; - padding:5px 8px; -} - -#mainmenu ul li a:hover, #mainmenu ul li.active a -{ - color: #6399cd; - background-color:#EFF4FA; - text-decoration:none; -} - -div.flash-error, div.flash-notice, div.flash-success -{ - padding:.8em; - margin-bottom:1em; - border:2px solid #ddd; -} - -div.flash-error -{ - background:#FBE3E4; - color:#8a1f11; - border-color:#FBC2C4; -} - -div.flash-notice -{ - background:#FFF6BF; - color:#514721; - border-color:#FFD324; -} - -div.flash-success -{ - background:#E6EFC2; - color:#264409; - border-color:#C6D880; -} - -div.flash-error a -{ - color:#8a1f11; -} - -div.flash-notice a -{ - color:#514721; -} - -div.flash-success a -{ - color:#264409; -} - -div.form .rememberMe label -{ - display: inline; -} - -div.view -{ - padding: 10px; - margin: 10px 0; - border: 1px solid #C9E0ED; -} - -div.breadcrumbs -{ - font-size: 0.9em; - padding: 5px 20px; -} - -div.breadcrumbs span -{ - font-weight: bold; -} - -div.search-form -{ - padding: 10px; - margin: 10px 0; - background: #eee; -} - -.portlet -{ - -} - -.portlet-decoration -{ - padding: 3px 8px; - background: #B7D6E7; - border-left: 5px solid #6FACCF; -} - -.portlet-title -{ - font-size: 12px; - font-weight: bold; - padding: 0; - margin: 0; - color: #298dcd; -} - -.portlet-content -{ - font-size:0.9em; - margin: 0 0 15px 0; - padding: 5px 8px; - background:#EFFDFF; -} - -.portlet-content ul -{ - list-style-image:none; - list-style-position:outside; - list-style-type:none; - margin: 0; - padding: 0; -} - -.portlet-content li -{ - padding: 2px 0 4px 0px; -} - -.operations -{ - list-style-type: none; - margin: 0; - padding: 0; -} - -.operations li -{ - padding-bottom: 2px; -} - -.operations li a -{ - font: bold 12px Arial; - color: #0066A4; - display: block; - padding: 2px 0 2px 8px; - line-height: 15px; - text-decoration: none; -} - -.operations li a:visited -{ - color: #0066A4; -} - -.operations li a:hover -{ - background: #80CFFF; -} \ No newline at end of file diff --git a/www/css/pager.css b/www/css/pager.css new file mode 100644 index 0000000..a8299c0 --- /dev/null +++ b/www/css/pager.css @@ -0,0 +1,77 @@ +/** + * CSS styles for CLinkPager. + * + * @author Qiang Xue + * @link http://www.yiiframework.com/ + * @copyright Copyright © 2008-2010 Yii Software LLC + * @license http://www.yiiframework.com/license/ + * @version $Id: pager.css 1678 2010-01-07 21:02:00Z qiang.xue $ + * @since 1.0 + */ + +ul.yiiPager +{ + display: inline; +} + +ul.yiiPager li +{ + display: inline; +} + +ul.yiiPager a +{ + color: #333333; + display: inline-block; + padding: 2px 8px; + border: 1px solid #ccc; + margin-left: 5px; + background: #eee url(../images/buttonbg5.png) repeat-x top left; + cursor: pointer; + -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; +} + +ul.yiiPager a:hover +{ + text-decoration: none; + background: #eee; + -moz-box-shadow: inset 1px 1px 2px #ccc; -webkit-box-shadow: inset 1px 1px 2px #ccc; + box-shadow: inset 1px 1px 2px #ccc; +} + +ul.yiiPager a:active +{ + display: inline-block; padding: 2px 8px; border: 1px solid #405A87; margin-left: 5px; + background: #405A87 url(../images/buttonbg3.png) repeat-x top left; color: #fff; + -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; +} + +ul.yiiPager a:link, +ul.yiiPager a:visited +{ +} + +ul.yiiPager .page a +{ +} + +ul.yiiPager .selected a +{ + background: url("../images/buttonbg3.png") repeat-x scroll left top #405A87; + border: 1px solid #405A87; + border-radius: 3px 3px 3px 3px; + color: #FFFFFF; + display: inline-block; + margin-left: 5px; + padding: 2px 8px; +} + +ul.yiiPager .hidden a +{ + color: #999; +} + +ul.yiiPager .first, +ul.yiiPager .last +{ +} \ No newline at end of file diff --git a/www/themes/intranet/css/plugins/colorbox.css b/www/css/plugins/colorbox.css similarity index 100% rename from www/themes/intranet/css/plugins/colorbox.css rename to www/css/plugins/colorbox.css diff --git a/www/themes/intranet/css/plugins/colorpicker.css b/www/css/plugins/colorpicker.css similarity index 100% rename from www/themes/intranet/css/plugins/colorpicker.css rename to www/css/plugins/colorpicker.css diff --git a/www/themes/intranet/css/plugins/elfinder.css b/www/css/plugins/elfinder.css similarity index 100% rename from www/themes/intranet/css/plugins/elfinder.css rename to www/css/plugins/elfinder.css diff --git a/www/themes/intranet/css/plugins/fullcalendar.css b/www/css/plugins/fullcalendar.css similarity index 100% rename from www/themes/intranet/css/plugins/fullcalendar.css rename to www/css/plugins/fullcalendar.css diff --git a/www/themes/intranet/css/plugins/jquery.alerts.css b/www/css/plugins/jquery.alerts.css similarity index 100% rename from www/themes/intranet/css/plugins/jquery.alerts.css rename to www/css/plugins/jquery.alerts.css diff --git a/www/themes/intranet/css/plugins/jquery.jgrowl.css b/www/css/plugins/jquery.jgrowl.css similarity index 100% rename from www/themes/intranet/css/plugins/jquery.jgrowl.css rename to www/css/plugins/jquery.jgrowl.css diff --git a/www/themes/intranet/css/plugins/jquery.ui.css b/www/css/plugins/jquery.ui.css similarity index 100% rename from www/themes/intranet/css/plugins/jquery.ui.css rename to www/css/plugins/jquery.ui.css diff --git a/www/themes/intranet/css/plugins/jquery.wysiwyg.css b/www/css/plugins/jquery.wysiwyg.css similarity index 100% rename from www/themes/intranet/css/plugins/jquery.wysiwyg.css rename to www/css/plugins/jquery.wysiwyg.css diff --git a/www/css/print.css b/www/css/print.css deleted file mode 100644 index bd79afd..0000000 --- a/www/css/print.css +++ /dev/null @@ -1,29 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 1.0.1 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* print.css */ -body {line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#000;background:none;font-size:10pt;} -.container {background:none;} -hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;} -hr.space {background:#fff;color:#fff;visibility:hidden;} -h1, h2, h3, h4, h5, h6 {font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;} -code {font:.9em "Courier New", Monaco, Courier, monospace;} -a img {border:none;} -p img.top {margin-top:0;} -blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;} -.small {font-size:.9em;} -.large {font-size:1.1em;} -.quiet {color:#999;} -.hide {display:none;} -a:link, a:visited {background:transparent;font-weight:700;text-decoration:underline;} -a:link:after, a:visited:after {content:" (" attr(href) ")";font-size:90%;} \ No newline at end of file diff --git a/www/css/screen.css b/www/css/screen.css deleted file mode 100644 index 7824d07..0000000 --- a/www/css/screen.css +++ /dev/null @@ -1,238 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 1.0.1 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* reset.css */ -html {margin:0;padding:0;border:0;} -body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;} -article, aside, details, figcaption, figure, dialog, footer, header, hgroup, menu, nav, section {display:block;} -body {line-height:1.5;background:white;} -table {border-collapse:separate;border-spacing:0;} -caption, th, td {text-align:left;font-weight:normal;float:none !important;} -table, th, td {vertical-align:middle;} -blockquote:before, blockquote:after, q:before, q:after {content:'';} -blockquote, q {quotes:"" "";} -a img {border:none;} -:focus {outline:0;} - -/* typography.css */ -html {font-size:100.01%;} -body {font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;} -h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;} -h1 {font-size:2em;line-height:1;margin-bottom:0.5em;} -h2 {font-size:1.6em;margin-bottom:0.75em;} -h3 {font-size:1.4em;line-height:1;margin-bottom:1em;} -h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;} -h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;} -h6 {font-size:1em;font-weight:bold;} -h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;} -p {margin:0 0 1.5em;} -.left {float:left !important;} -p .left {margin:1.5em 1.5em 1.5em 0;padding:0;} -.right {float:right !important;} -p .right {margin:1.5em 0 1.5em 1.5em;padding:0;} -a:focus, a:hover {color:#09f;} -a {color:#06c;text-decoration:underline;} -blockquote {margin:1.5em;color:#666;font-style:italic;} -strong, dfn {font-weight:bold;} -em, dfn {font-style:italic;} -sup, sub {line-height:0;} -abbr, acronym {border-bottom:1px dotted #666;} -address {margin:0 0 1.5em;font-style:italic;} -del {color:#666;} -pre {margin:1.5em 0;white-space:pre;} -pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;} -li ul, li ol {margin:0;} -ul, ol {margin:0 1.5em 1.5em 0;padding-left:1.5em;} -ul {list-style-type:disc;} -ol {list-style-type:decimal;} -dl {margin:0 0 1.5em 0;} -dl dt {font-weight:bold;} -dd {margin-left:1.5em;} -table {margin-bottom:1.4em;width:100%;} -th {font-weight:bold;} -thead th {background:#c3d9ff;} -th, td, caption {padding:4px 10px 4px 5px;} -tfoot {font-style:italic;} -caption {background:#eee;} -.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;} -.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;} -.hide {display:none;} -.quiet {color:#666;} -.loud {color:#000;} -.highlight {background:#ff0;} -.added {background:#060;color:#fff;} -.removed {background:#900;color:#fff;} -.first {margin-left:0;padding-left:0;} -.last {margin-right:0;padding-right:0;} -.top {margin-top:0;padding-top:0;} -.bottom {margin-bottom:0;padding-bottom:0;} - -/* grid.css */ -.container {width:950px;margin:0 auto;} -.column, .span-1, .span-2, .span-3, .span-4, .span-5, .span-6, .span-7, .span-8, .span-9, .span-10, .span-11, .span-12, .span-13, .span-14, .span-15, .span-16, .span-17, .span-18, .span-19, .span-20, .span-21, .span-22, .span-23, .span-24 {float:left;margin-right:10px;} -.last {margin-right:0;} -.span-1 {width:30px;} -.span-2 {width:70px;} -.span-3 {width:110px;} -.span-4 {width:150px;} -.span-5 {width:190px;} -.span-6 {width:230px;} -.span-7 {width:270px;} -.span-8 {width:310px;} -.span-9 {width:350px;} -.span-10 {width:390px;} -.span-11 {width:430px;} -.span-12 {width:470px;} -.span-13 {width:510px;} -.span-14 {width:550px;} -.span-15 {width:590px;} -.span-16 {width:630px;} -.span-17 {width:670px;} -.span-18 {width:710px;} -.span-19 {width:750px;} -.span-20 {width:790px;} -.span-21 {width:830px;} -.span-22 {width:870px;} -.span-23 {width:910px;} -.span-24 {width:950px;margin-right:0;} -input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24 {border-left-width:1px;border-right-width:1px;padding-left:5px;padding-right:5px;} -input.span-1, textarea.span-1 {width:18px;} -input.span-2, textarea.span-2 {width:58px;} -input.span-3, textarea.span-3 {width:98px;} -input.span-4, textarea.span-4 {width:138px;} -input.span-5, textarea.span-5 {width:178px;} -input.span-6, textarea.span-6 {width:218px;} -input.span-7, textarea.span-7 {width:258px;} -input.span-8, textarea.span-8 {width:298px;} -input.span-9, textarea.span-9 {width:338px;} -input.span-10, textarea.span-10 {width:378px;} -input.span-11, textarea.span-11 {width:418px;} -input.span-12, textarea.span-12 {width:458px;} -input.span-13, textarea.span-13 {width:498px;} -input.span-14, textarea.span-14 {width:538px;} -input.span-15, textarea.span-15 {width:578px;} -input.span-16, textarea.span-16 {width:618px;} -input.span-17, textarea.span-17 {width:658px;} -input.span-18, textarea.span-18 {width:698px;} -input.span-19, textarea.span-19 {width:738px;} -input.span-20, textarea.span-20 {width:778px;} -input.span-21, textarea.span-21 {width:818px;} -input.span-22, textarea.span-22 {width:858px;} -input.span-23, textarea.span-23 {width:898px;} -input.span-24, textarea.span-24 {width:938px;} -.append-1 {padding-right:40px;} -.append-2 {padding-right:80px;} -.append-3 {padding-right:120px;} -.append-4 {padding-right:160px;} -.append-5 {padding-right:200px;} -.append-6 {padding-right:240px;} -.append-7 {padding-right:280px;} -.append-8 {padding-right:320px;} -.append-9 {padding-right:360px;} -.append-10 {padding-right:400px;} -.append-11 {padding-right:440px;} -.append-12 {padding-right:480px;} -.append-13 {padding-right:520px;} -.append-14 {padding-right:560px;} -.append-15 {padding-right:600px;} -.append-16 {padding-right:640px;} -.append-17 {padding-right:680px;} -.append-18 {padding-right:720px;} -.append-19 {padding-right:760px;} -.append-20 {padding-right:800px;} -.append-21 {padding-right:840px;} -.append-22 {padding-right:880px;} -.append-23 {padding-right:920px;} -.prepend-1 {padding-left:40px;} -.prepend-2 {padding-left:80px;} -.prepend-3 {padding-left:120px;} -.prepend-4 {padding-left:160px;} -.prepend-5 {padding-left:200px;} -.prepend-6 {padding-left:240px;} -.prepend-7 {padding-left:280px;} -.prepend-8 {padding-left:320px;} -.prepend-9 {padding-left:360px;} -.prepend-10 {padding-left:400px;} -.prepend-11 {padding-left:440px;} -.prepend-12 {padding-left:480px;} -.prepend-13 {padding-left:520px;} -.prepend-14 {padding-left:560px;} -.prepend-15 {padding-left:600px;} -.prepend-16 {padding-left:640px;} -.prepend-17 {padding-left:680px;} -.prepend-18 {padding-left:720px;} -.prepend-19 {padding-left:760px;} -.prepend-20 {padding-left:800px;} -.prepend-21 {padding-left:840px;} -.prepend-22 {padding-left:880px;} -.prepend-23 {padding-left:920px;} -.border {padding-right:4px;margin-right:5px;border-right:1px solid #ddd;} -.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #ddd;} -.pull-1 {margin-left:-40px;} -.pull-2 {margin-left:-80px;} -.pull-3 {margin-left:-120px;} -.pull-4 {margin-left:-160px;} -.pull-5 {margin-left:-200px;} -.pull-6 {margin-left:-240px;} -.pull-7 {margin-left:-280px;} -.pull-8 {margin-left:-320px;} -.pull-9 {margin-left:-360px;} -.pull-10 {margin-left:-400px;} -.pull-11 {margin-left:-440px;} -.pull-12 {margin-left:-480px;} -.pull-13 {margin-left:-520px;} -.pull-14 {margin-left:-560px;} -.pull-15 {margin-left:-600px;} -.pull-16 {margin-left:-640px;} -.pull-17 {margin-left:-680px;} -.pull-18 {margin-left:-720px;} -.pull-19 {margin-left:-760px;} -.pull-20 {margin-left:-800px;} -.pull-21 {margin-left:-840px;} -.pull-22 {margin-left:-880px;} -.pull-23 {margin-left:-920px;} -.pull-24 {margin-left:-960px;} -.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float:left;position:relative;} -.push-1 {margin:0 -40px 1.5em 40px;} -.push-2 {margin:0 -80px 1.5em 80px;} -.push-3 {margin:0 -120px 1.5em 120px;} -.push-4 {margin:0 -160px 1.5em 160px;} -.push-5 {margin:0 -200px 1.5em 200px;} -.push-6 {margin:0 -240px 1.5em 240px;} -.push-7 {margin:0 -280px 1.5em 280px;} -.push-8 {margin:0 -320px 1.5em 320px;} -.push-9 {margin:0 -360px 1.5em 360px;} -.push-10 {margin:0 -400px 1.5em 400px;} -.push-11 {margin:0 -440px 1.5em 440px;} -.push-12 {margin:0 -480px 1.5em 480px;} -.push-13 {margin:0 -520px 1.5em 520px;} -.push-14 {margin:0 -560px 1.5em 560px;} -.push-15 {margin:0 -600px 1.5em 600px;} -.push-16 {margin:0 -640px 1.5em 640px;} -.push-17 {margin:0 -680px 1.5em 680px;} -.push-18 {margin:0 -720px 1.5em 720px;} -.push-19 {margin:0 -760px 1.5em 760px;} -.push-20 {margin:0 -800px 1.5em 800px;} -.push-21 {margin:0 -840px 1.5em 840px;} -.push-22 {margin:0 -880px 1.5em 880px;} -.push-23 {margin:0 -920px 1.5em 920px;} -.push-24 {margin:0 -960px 1.5em 960px;} -.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float:left;position:relative;} -div.prepend-top, .prepend-top {margin-top:1.5em;} -div.append-bottom, .append-bottom {margin-bottom:1.5em;} -.box {padding:1.5em;margin-bottom:1.5em;background:#e5eCf9;} -hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:1px;margin:0 0 17px;border:none;} -hr.space {background:#fff;color:#fff;visibility:hidden;} -.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;} -.clearfix, .container {display:block;} -.clear {clear:both;} diff --git a/www/themes/intranet/css/style.css b/www/css/style.css similarity index 96% rename from www/themes/intranet/css/style.css rename to www/css/style.css index 53de5fa..f7e4974 100644 --- a/www/themes/intranet/css/style.css +++ b/www/css/style.css @@ -134,7 +134,7 @@ h2.prize { font-size: 20px; color: #000; font-family: Arial, Helvetica, sans-ser #search button { float: left; border: 0; margin: 0; background: #333 url(../images/searchicon.png) no-repeat 0 0; width: 27px; height: 30px; cursor: pointer; } /***HEADER (all page)***/ -.header { background: #333 url(../images/texturebg.png); padding: 20px 10px 11px 10px; position: relative; } +.header { background: #333 url(../images/texturebg.png); padding: 14px 10px 11px 10px; position: relative; } .header { border-top: 1px solid #444; border-bottom: 3px solid #272727; } .accountinfo { position: absolute; right: 10px; top: 6px; background: url(../images/blacktrans.png); padding: 10px; overflow: hidden; line-height: 15px; } .accountinfo { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; } @@ -455,7 +455,7 @@ input[type=radio], input[type=checkbox] { margin: 0; padding: 0; vertical-align: .sTable3 tbody tr.even td { background: #fcfcfc; } /**dynamic table***/ -.dataTables_wrapper { border: 1px solid #ccc; background: #eee url(../images/thead.png) repeat-x top left; +/*.dataTables_wrapper { border: 1px solid #ccc; background: #eee url(../images/thead.png) repeat-x top left; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; position: relative; } .dataTables_filter { position: absolute; top: 11px; right: 5px; } .dataTables_length { padding: 10px 10px; } @@ -472,23 +472,8 @@ input[type=radio], input[type=checkbox] { margin: 0; padding: 0; vertical-align: .dyntable thead th.sorting_asc { background-image: url(../images/sort_asc.png); background-repeat: no-repeat; background-position: right 6px; } .dyntable thead th.sorting_desc { background-image: url(../images/sort_desc.png); background-repeat: no-repeat; background-position: right 6px; } -.dataTables_info { padding: 10px; } -.paging_full_numbers { position: absolute; bottom: 7px; right: 8px; } -.paging_full_numbers .paginate_button { - display: inline-block; padding: 2px 8px; border: 1px solid #ccc; margin-left: 5px; - background: #eee url(../images/buttonbg5.png) repeat-x top left; cursor: pointer; - -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; -} -.paging_full_numbers .paginate_button:hover { - background: #eee; -moz-box-shadow: inset 1px 1px 2px #ccc; -webkit-box-shadow: inset 1px 1px 2px #ccc; - box-shadow: inset 1px 1px 2px #ccc; -} -.paging_full_numbers .paginate_active, .paging_full_numbers .paginate_button:active { - display: inline-block; padding: 2px 8px; border: 1px solid #405A87; margin-left: 5px; - background: #405A87 url(../images/buttonbg3.png) repeat-x top left; color: #fff; - -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; -} -.paging_full_numbers .paginate_button_disabled { color: #999; } +.dataTables_info { padding: 10px; }*/ + /***PAGINATION (users.html)***/ .pagination a { display: inline-block; padding: 5px 10px; color: #333; border: 1px solid #bbb; background: url(../images/buttonbg5.png) repeat-x bottom left; } diff --git a/www/themes/intranet/fonts/droidsans-webfont.eot b/www/fonts/droidsans-webfont.eot similarity index 100% rename from www/themes/intranet/fonts/droidsans-webfont.eot rename to www/fonts/droidsans-webfont.eot diff --git a/www/themes/intranet/fonts/droidsans-webfont.svg b/www/fonts/droidsans-webfont.svg similarity index 100% rename from www/themes/intranet/fonts/droidsans-webfont.svg rename to www/fonts/droidsans-webfont.svg diff --git a/www/themes/intranet/fonts/droidsans-webfont.ttf b/www/fonts/droidsans-webfont.ttf similarity index 100% rename from www/themes/intranet/fonts/droidsans-webfont.ttf rename to www/fonts/droidsans-webfont.ttf diff --git a/www/themes/intranet/fonts/droidsans-webfont.woff b/www/fonts/droidsans-webfont.woff similarity index 100% rename from www/themes/intranet/fonts/droidsans-webfont.woff rename to www/fonts/droidsans-webfont.woff diff --git a/www/themes/intranet/fonts/index.html b/www/fonts/index.html similarity index 100% rename from www/themes/intranet/fonts/index.html rename to www/fonts/index.html diff --git a/www/themes/intranet/images/arrow.png b/www/images/arrow.png similarity index 100% rename from www/themes/intranet/images/arrow.png rename to www/images/arrow.png diff --git a/www/themes/intranet/images/assets/image1.png b/www/images/assets/image1.png similarity index 100% rename from www/themes/intranet/images/assets/image1.png rename to www/images/assets/image1.png diff --git a/www/themes/intranet/images/assets/thumb/large/thumb1.png b/www/images/assets/thumb/large/thumb1.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/large/thumb1.png rename to www/images/assets/thumb/large/thumb1.png diff --git a/www/themes/intranet/images/assets/thumb/large/thumb2.png b/www/images/assets/thumb/large/thumb2.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/large/thumb2.png rename to www/images/assets/thumb/large/thumb2.png diff --git a/www/themes/intranet/images/assets/thumb/large/thumb3.png b/www/images/assets/thumb/large/thumb3.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/large/thumb3.png rename to www/images/assets/thumb/large/thumb3.png diff --git a/www/themes/intranet/images/assets/thumb/large/thumb4.png b/www/images/assets/thumb/large/thumb4.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/large/thumb4.png rename to www/images/assets/thumb/large/thumb4.png diff --git a/www/themes/intranet/images/assets/thumb/large/thumb5.png b/www/images/assets/thumb/large/thumb5.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/large/thumb5.png rename to www/images/assets/thumb/large/thumb5.png diff --git a/www/themes/intranet/images/assets/thumb/large/thumb6.png b/www/images/assets/thumb/large/thumb6.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/large/thumb6.png rename to www/images/assets/thumb/large/thumb6.png diff --git a/www/themes/intranet/images/assets/thumb/large/thumb7.png b/www/images/assets/thumb/large/thumb7.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/large/thumb7.png rename to www/images/assets/thumb/large/thumb7.png diff --git a/www/themes/intranet/images/assets/thumb/large/thumb8.png b/www/images/assets/thumb/large/thumb8.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/large/thumb8.png rename to www/images/assets/thumb/large/thumb8.png diff --git a/www/themes/intranet/images/assets/thumb/large/thumb9.png b/www/images/assets/thumb/large/thumb9.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/large/thumb9.png rename to www/images/assets/thumb/large/thumb9.png diff --git a/www/themes/intranet/images/assets/thumb/medium/thumb1.png b/www/images/assets/thumb/medium/thumb1.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/medium/thumb1.png rename to www/images/assets/thumb/medium/thumb1.png diff --git a/www/themes/intranet/images/assets/thumb/medium/thumb2.png b/www/images/assets/thumb/medium/thumb2.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/medium/thumb2.png rename to www/images/assets/thumb/medium/thumb2.png diff --git a/www/themes/intranet/images/assets/thumb/medium/thumb3.png b/www/images/assets/thumb/medium/thumb3.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/medium/thumb3.png rename to www/images/assets/thumb/medium/thumb3.png diff --git a/www/themes/intranet/images/assets/thumb/medium/thumb4.png b/www/images/assets/thumb/medium/thumb4.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/medium/thumb4.png rename to www/images/assets/thumb/medium/thumb4.png diff --git a/www/themes/intranet/images/assets/thumb/medium/thumb5.png b/www/images/assets/thumb/medium/thumb5.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/medium/thumb5.png rename to www/images/assets/thumb/medium/thumb5.png diff --git a/www/themes/intranet/images/assets/thumb/medium/thumb6.png b/www/images/assets/thumb/medium/thumb6.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/medium/thumb6.png rename to www/images/assets/thumb/medium/thumb6.png diff --git a/www/themes/intranet/images/assets/thumb/medium/thumb7.png b/www/images/assets/thumb/medium/thumb7.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/medium/thumb7.png rename to www/images/assets/thumb/medium/thumb7.png diff --git a/www/themes/intranet/images/assets/thumb/medium/thumb8.png b/www/images/assets/thumb/medium/thumb8.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/medium/thumb8.png rename to www/images/assets/thumb/medium/thumb8.png diff --git a/www/themes/intranet/images/assets/thumb/medium/thumb9.png b/www/images/assets/thumb/medium/thumb9.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/medium/thumb9.png rename to www/images/assets/thumb/medium/thumb9.png diff --git a/www/themes/intranet/images/assets/thumb/small/thumb1.png b/www/images/assets/thumb/small/thumb1.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/small/thumb1.png rename to www/images/assets/thumb/small/thumb1.png diff --git a/www/themes/intranet/images/assets/thumb/small/thumb2.png b/www/images/assets/thumb/small/thumb2.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/small/thumb2.png rename to www/images/assets/thumb/small/thumb2.png diff --git a/www/themes/intranet/images/assets/thumb/small/thumb3.png b/www/images/assets/thumb/small/thumb3.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/small/thumb3.png rename to www/images/assets/thumb/small/thumb3.png diff --git a/www/themes/intranet/images/assets/thumb/small/thumb4.png b/www/images/assets/thumb/small/thumb4.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/small/thumb4.png rename to www/images/assets/thumb/small/thumb4.png diff --git a/www/themes/intranet/images/assets/thumb/small/thumb5.png b/www/images/assets/thumb/small/thumb5.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/small/thumb5.png rename to www/images/assets/thumb/small/thumb5.png diff --git a/www/themes/intranet/images/assets/thumb/small/thumb6.png b/www/images/assets/thumb/small/thumb6.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/small/thumb6.png rename to www/images/assets/thumb/small/thumb6.png diff --git a/www/themes/intranet/images/assets/thumb/small/thumb7.png b/www/images/assets/thumb/small/thumb7.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/small/thumb7.png rename to www/images/assets/thumb/small/thumb7.png diff --git a/www/themes/intranet/images/assets/thumb/small/thumb8.png b/www/images/assets/thumb/small/thumb8.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/small/thumb8.png rename to www/images/assets/thumb/small/thumb8.png diff --git a/www/themes/intranet/images/assets/thumb/small/thumb9.png b/www/images/assets/thumb/small/thumb9.png similarity index 100% rename from www/themes/intranet/images/assets/thumb/small/thumb9.png rename to www/images/assets/thumb/small/thumb9.png diff --git a/www/themes/intranet/images/avatar.png b/www/images/avatar.png similarity index 100% rename from www/themes/intranet/images/avatar.png rename to www/images/avatar.png diff --git a/www/themes/intranet/images/barbg.png b/www/images/barbg.png similarity index 100% rename from www/themes/intranet/images/barbg.png rename to www/images/barbg.png diff --git a/www/themes/intranet/images/bgbutton4.png b/www/images/bgbutton4.png similarity index 100% rename from www/themes/intranet/images/bgbutton4.png rename to www/images/bgbutton4.png diff --git a/www/themes/intranet/images/bgbutton5.png b/www/images/bgbutton5.png similarity index 100% rename from www/themes/intranet/images/bgbutton5.png rename to www/images/bgbutton5.png diff --git a/www/themes/intranet/images/blacktrans.png b/www/images/blacktrans.png similarity index 100% rename from www/themes/intranet/images/blacktrans.png rename to www/images/blacktrans.png diff --git a/www/themes/intranet/images/blacktrans1.png b/www/images/blacktrans1.png similarity index 100% rename from www/themes/intranet/images/blacktrans1.png rename to www/images/blacktrans1.png diff --git a/www/themes/intranet/images/blacktrans2.png b/www/images/blacktrans2.png similarity index 100% rename from www/themes/intranet/images/blacktrans2.png rename to www/images/blacktrans2.png diff --git a/www/themes/intranet/images/bluetrans.png b/www/images/bluetrans.png similarity index 100% rename from www/themes/intranet/images/bluetrans.png rename to www/images/bluetrans.png diff --git a/www/themes/intranet/images/borderwhite.png b/www/images/borderwhite.png similarity index 100% rename from www/themes/intranet/images/borderwhite.png rename to www/images/borderwhite.png diff --git a/www/themes/intranet/images/buttonbg.png b/www/images/buttonbg.png similarity index 100% rename from www/themes/intranet/images/buttonbg.png rename to www/images/buttonbg.png diff --git a/www/themes/intranet/images/buttonbg2.png b/www/images/buttonbg2.png similarity index 100% rename from www/themes/intranet/images/buttonbg2.png rename to www/images/buttonbg2.png diff --git a/www/themes/intranet/images/buttonbg3.png b/www/images/buttonbg3.png similarity index 100% rename from www/themes/intranet/images/buttonbg3.png rename to www/images/buttonbg3.png diff --git a/www/themes/intranet/images/buttonbg5.png b/www/images/buttonbg5.png similarity index 100% rename from www/themes/intranet/images/buttonbg5.png rename to www/images/buttonbg5.png diff --git a/www/themes/intranet/images/buttonbg6.png b/www/images/buttonbg6.png similarity index 100% rename from www/themes/intranet/images/buttonbg6.png rename to www/images/buttonbg6.png diff --git a/www/themes/intranet/images/buttons/button_black.png b/www/images/buttons/button_black.png similarity index 100% rename from www/themes/intranet/images/buttons/button_black.png rename to www/images/buttons/button_black.png diff --git a/www/themes/intranet/images/buttons/button_blue.png b/www/images/buttons/button_blue.png similarity index 100% rename from www/themes/intranet/images/buttons/button_blue.png rename to www/images/buttons/button_blue.png diff --git a/www/themes/intranet/images/buttons/button_brown.png b/www/images/buttons/button_brown.png similarity index 100% rename from www/themes/intranet/images/buttons/button_brown.png rename to www/images/buttons/button_brown.png diff --git a/www/themes/intranet/images/buttons/button_green.png b/www/images/buttons/button_green.png similarity index 100% rename from www/themes/intranet/images/buttons/button_green.png rename to www/images/buttons/button_green.png diff --git a/www/themes/intranet/images/buttons/button_lblue.png b/www/images/buttons/button_lblue.png similarity index 100% rename from www/themes/intranet/images/buttons/button_lblue.png rename to www/images/buttons/button_lblue.png diff --git a/www/themes/intranet/images/buttons/button_red.png b/www/images/buttons/button_red.png similarity index 100% rename from www/themes/intranet/images/buttons/button_red.png rename to www/images/buttons/button_red.png diff --git a/www/themes/intranet/images/buttons/button_white.png b/www/images/buttons/button_white.png similarity index 100% rename from www/themes/intranet/images/buttons/button_white.png rename to www/images/buttons/button_white.png diff --git a/www/themes/intranet/images/buttons/button_yellow.png b/www/images/buttons/button_yellow.png similarity index 100% rename from www/themes/intranet/images/buttons/button_yellow.png rename to www/images/buttons/button_yellow.png diff --git a/www/themes/intranet/images/colorbox/controls.png b/www/images/colorbox/controls.png similarity index 100% rename from www/themes/intranet/images/colorbox/controls.png rename to www/images/colorbox/controls.png diff --git a/www/themes/intranet/images/colorbox/loading.gif b/www/images/colorbox/loading.gif similarity index 100% rename from www/themes/intranet/images/colorbox/loading.gif rename to www/images/colorbox/loading.gif diff --git a/www/themes/intranet/images/colorpicker.png b/www/images/colorpicker.png similarity index 100% rename from www/themes/intranet/images/colorpicker.png rename to www/images/colorpicker.png diff --git a/www/themes/intranet/images/colorpicker/Thumbs.db b/www/images/colorpicker/Thumbs.db similarity index 100% rename from www/themes/intranet/images/colorpicker/Thumbs.db rename to www/images/colorpicker/Thumbs.db diff --git a/www/themes/intranet/images/colorpicker/blank.gif b/www/images/colorpicker/blank.gif similarity index 100% rename from www/themes/intranet/images/colorpicker/blank.gif rename to www/images/colorpicker/blank.gif diff --git a/www/themes/intranet/images/colorpicker/colorpicker_background.png b/www/images/colorpicker/colorpicker_background.png similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_background.png rename to www/images/colorpicker/colorpicker_background.png diff --git a/www/themes/intranet/images/colorpicker/colorpicker_hex.png b/www/images/colorpicker/colorpicker_hex.png similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_hex.png rename to www/images/colorpicker/colorpicker_hex.png diff --git a/www/themes/intranet/images/colorpicker/colorpicker_hsb_b.png b/www/images/colorpicker/colorpicker_hsb_b.png similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_hsb_b.png rename to www/images/colorpicker/colorpicker_hsb_b.png diff --git a/www/themes/intranet/images/colorpicker/colorpicker_hsb_h.png b/www/images/colorpicker/colorpicker_hsb_h.png similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_hsb_h.png rename to www/images/colorpicker/colorpicker_hsb_h.png diff --git a/www/themes/intranet/images/colorpicker/colorpicker_hsb_s.png b/www/images/colorpicker/colorpicker_hsb_s.png similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_hsb_s.png rename to www/images/colorpicker/colorpicker_hsb_s.png diff --git a/www/themes/intranet/images/colorpicker/colorpicker_indic.gif b/www/images/colorpicker/colorpicker_indic.gif similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_indic.gif rename to www/images/colorpicker/colorpicker_indic.gif diff --git a/www/themes/intranet/images/colorpicker/colorpicker_overlay.png b/www/images/colorpicker/colorpicker_overlay.png similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_overlay.png rename to www/images/colorpicker/colorpicker_overlay.png diff --git a/www/themes/intranet/images/colorpicker/colorpicker_rgb_b.png b/www/images/colorpicker/colorpicker_rgb_b.png similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_rgb_b.png rename to www/images/colorpicker/colorpicker_rgb_b.png diff --git a/www/themes/intranet/images/colorpicker/colorpicker_rgb_g.png b/www/images/colorpicker/colorpicker_rgb_g.png similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_rgb_g.png rename to www/images/colorpicker/colorpicker_rgb_g.png diff --git a/www/themes/intranet/images/colorpicker/colorpicker_rgb_r.png b/www/images/colorpicker/colorpicker_rgb_r.png similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_rgb_r.png rename to www/images/colorpicker/colorpicker_rgb_r.png diff --git a/www/themes/intranet/images/colorpicker/colorpicker_select.gif b/www/images/colorpicker/colorpicker_select.gif similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_select.gif rename to www/images/colorpicker/colorpicker_select.gif diff --git a/www/themes/intranet/images/colorpicker/colorpicker_submit.png b/www/images/colorpicker/colorpicker_submit.png similarity index 100% rename from www/themes/intranet/images/colorpicker/colorpicker_submit.png rename to www/images/colorpicker/colorpicker_submit.png diff --git a/www/themes/intranet/images/colorpicker/custom_background.png b/www/images/colorpicker/custom_background.png similarity index 100% rename from www/themes/intranet/images/colorpicker/custom_background.png rename to www/images/colorpicker/custom_background.png diff --git a/www/themes/intranet/images/colorpicker/custom_hex.png b/www/images/colorpicker/custom_hex.png similarity index 100% rename from www/themes/intranet/images/colorpicker/custom_hex.png rename to www/images/colorpicker/custom_hex.png diff --git a/www/themes/intranet/images/colorpicker/custom_hsb_b.png b/www/images/colorpicker/custom_hsb_b.png similarity index 100% rename from www/themes/intranet/images/colorpicker/custom_hsb_b.png rename to www/images/colorpicker/custom_hsb_b.png diff --git a/www/themes/intranet/images/colorpicker/custom_hsb_h.png b/www/images/colorpicker/custom_hsb_h.png similarity index 100% rename from www/themes/intranet/images/colorpicker/custom_hsb_h.png rename to www/images/colorpicker/custom_hsb_h.png diff --git a/www/themes/intranet/images/colorpicker/custom_hsb_s.png b/www/images/colorpicker/custom_hsb_s.png similarity index 100% rename from www/themes/intranet/images/colorpicker/custom_hsb_s.png rename to www/images/colorpicker/custom_hsb_s.png diff --git a/www/themes/intranet/images/colorpicker/custom_indic.gif b/www/images/colorpicker/custom_indic.gif similarity index 100% rename from www/themes/intranet/images/colorpicker/custom_indic.gif rename to www/images/colorpicker/custom_indic.gif diff --git a/www/themes/intranet/images/colorpicker/custom_rgb_b.png b/www/images/colorpicker/custom_rgb_b.png similarity index 100% rename from www/themes/intranet/images/colorpicker/custom_rgb_b.png rename to www/images/colorpicker/custom_rgb_b.png diff --git a/www/themes/intranet/images/colorpicker/custom_rgb_g.png b/www/images/colorpicker/custom_rgb_g.png similarity index 100% rename from www/themes/intranet/images/colorpicker/custom_rgb_g.png rename to www/images/colorpicker/custom_rgb_g.png diff --git a/www/themes/intranet/images/colorpicker/custom_rgb_r.png b/www/images/colorpicker/custom_rgb_r.png similarity index 100% rename from www/themes/intranet/images/colorpicker/custom_rgb_r.png rename to www/images/colorpicker/custom_rgb_r.png diff --git a/www/themes/intranet/images/colorpicker/custom_submit.png b/www/images/colorpicker/custom_submit.png similarity index 100% rename from www/themes/intranet/images/colorpicker/custom_submit.png rename to www/images/colorpicker/custom_submit.png diff --git a/www/themes/intranet/images/colorpicker/select.png b/www/images/colorpicker/select.png similarity index 100% rename from www/themes/intranet/images/colorpicker/select.png rename to www/images/colorpicker/select.png diff --git a/www/themes/intranet/images/colorpicker/select2.png b/www/images/colorpicker/select2.png similarity index 100% rename from www/themes/intranet/images/colorpicker/select2.png rename to www/images/colorpicker/select2.png diff --git a/www/themes/intranet/images/colorpicker/slider.png b/www/images/colorpicker/slider.png similarity index 100% rename from www/themes/intranet/images/colorpicker/slider.png rename to www/images/colorpicker/slider.png diff --git a/www/themes/intranet/images/filemanager/icons-big.png b/www/images/filemanager/icons-big.png similarity index 100% rename from www/themes/intranet/images/filemanager/icons-big.png rename to www/images/filemanager/icons-big.png diff --git a/www/themes/intranet/images/filemanager/icons-small.png b/www/images/filemanager/icons-small.png similarity index 100% rename from www/themes/intranet/images/filemanager/icons-small.png rename to www/images/filemanager/icons-small.png diff --git a/www/themes/intranet/images/filemanager/ql.png b/www/images/filemanager/ql.png similarity index 100% rename from www/themes/intranet/images/filemanager/ql.png rename to www/images/filemanager/ql.png diff --git a/www/themes/intranet/images/filemanager/spinner.gif b/www/images/filemanager/spinner.gif similarity index 100% rename from www/themes/intranet/images/filemanager/spinner.gif rename to www/images/filemanager/spinner.gif diff --git a/www/themes/intranet/images/filemanager/toolbar.png b/www/images/filemanager/toolbar.png similarity index 100% rename from www/themes/intranet/images/filemanager/toolbar.png rename to www/images/filemanager/toolbar.png diff --git a/www/themes/intranet/images/gradcircle.png b/www/images/gradcircle.png similarity index 100% rename from www/themes/intranet/images/gradcircle.png rename to www/images/gradcircle.png diff --git a/www/themes/intranet/images/headbutton.png b/www/images/headbutton.png similarity index 100% rename from www/themes/intranet/images/headbutton.png rename to www/images/headbutton.png diff --git a/www/themes/intranet/images/help.gif b/www/images/help.gif similarity index 100% rename from www/themes/intranet/images/help.gif rename to www/images/help.gif diff --git a/www/themes/intranet/images/icons/404.png b/www/images/icons/404.png similarity index 100% rename from www/themes/intranet/images/icons/404.png rename to www/images/icons/404.png diff --git a/www/themes/intranet/images/icons/buttons.png b/www/images/icons/buttons.png similarity index 100% rename from www/themes/intranet/images/icons/buttons.png rename to www/images/icons/buttons.png diff --git a/www/themes/intranet/images/icons/cal.png b/www/images/icons/cal.png similarity index 100% rename from www/themes/intranet/images/icons/cal.png rename to www/images/icons/cal.png diff --git a/www/themes/intranet/images/icons/calarrow.png b/www/images/icons/calarrow.png similarity index 100% rename from www/themes/intranet/images/icons/calarrow.png rename to www/images/icons/calarrow.png diff --git a/www/themes/intranet/images/icons/calendar.png b/www/images/icons/calendar.png similarity index 100% rename from www/themes/intranet/images/icons/calendar.png rename to www/images/icons/calendar.png diff --git a/www/themes/intranet/images/icons/candidatos.png b/www/images/icons/candidatos.png similarity index 100% rename from www/themes/intranet/images/icons/candidatos.png rename to www/images/icons/candidatos.png diff --git a/www/themes/intranet/images/icons/close.png b/www/images/icons/close.png similarity index 100% rename from www/themes/intranet/images/icons/close.png rename to www/images/icons/close.png diff --git a/www/themes/intranet/images/icons/createreport.png b/www/images/icons/createreport.png similarity index 100% rename from www/themes/intranet/images/icons/createreport.png rename to www/images/icons/createreport.png diff --git a/www/themes/intranet/images/icons/dashboard.png b/www/images/icons/dashboard.png similarity index 100% rename from www/themes/intranet/images/icons/dashboard.png rename to www/images/icons/dashboard.png diff --git a/www/themes/intranet/images/icons/document.png b/www/images/icons/document.png similarity index 100% rename from www/themes/intranet/images/icons/document.png rename to www/images/icons/document.png diff --git a/www/themes/intranet/images/icons/editor.png b/www/images/icons/editor.png similarity index 100% rename from www/themes/intranet/images/icons/editor.png rename to www/images/icons/editor.png diff --git a/www/themes/intranet/images/icons/elements.png b/www/images/icons/elements.png similarity index 100% rename from www/themes/intranet/images/icons/elements.png rename to www/images/icons/elements.png diff --git a/www/themes/intranet/images/icons/error.png b/www/images/icons/error.png similarity index 100% rename from www/themes/intranet/images/icons/error.png rename to www/images/icons/error.png diff --git a/www/themes/intranet/images/icons/file.png b/www/images/icons/file.png similarity index 100% rename from www/themes/intranet/images/icons/file.png rename to www/images/icons/file.png diff --git a/www/themes/intranet/images/icons/form.png b/www/images/icons/form.png similarity index 100% rename from www/themes/intranet/images/icons/form.png rename to www/images/icons/form.png diff --git a/www/themes/intranet/images/icons/gallery.png b/www/images/icons/gallery.png similarity index 100% rename from www/themes/intranet/images/icons/gallery.png rename to www/images/icons/gallery.png diff --git a/www/themes/intranet/images/icons/grid.png b/www/images/icons/grid.png similarity index 100% rename from www/themes/intranet/images/icons/grid.png rename to www/images/icons/grid.png diff --git a/www/themes/intranet/images/icons/hbutton.png b/www/images/icons/hbutton.png similarity index 100% rename from www/themes/intranet/images/icons/hbutton.png rename to www/images/icons/hbutton.png diff --git a/www/themes/intranet/images/icons/home.png b/www/images/icons/home.png similarity index 100% rename from www/themes/intranet/images/icons/home.png rename to www/images/icons/home.png diff --git a/www/themes/intranet/images/icons/homesmall.png b/www/images/icons/homesmall.png similarity index 100% rename from www/themes/intranet/images/icons/homesmall.png rename to www/images/icons/homesmall.png diff --git a/www/themes/intranet/images/icons/info.png b/www/images/icons/info.png similarity index 100% rename from www/themes/intranet/images/icons/info.png rename to www/images/icons/info.png diff --git a/www/themes/intranet/images/icons/mail.png b/www/images/icons/mail.png similarity index 100% rename from www/themes/intranet/images/icons/mail.png rename to www/images/icons/mail.png diff --git a/www/themes/intranet/images/icons/media.png b/www/images/icons/media.png similarity index 100% rename from www/themes/intranet/images/icons/media.png rename to www/images/icons/media.png diff --git a/www/themes/intranet/images/icons/message.png b/www/images/icons/message.png similarity index 100% rename from www/themes/intranet/images/icons/message.png rename to www/images/icons/message.png diff --git a/www/themes/intranet/images/icons/notification.png b/www/images/icons/notification.png similarity index 100% rename from www/themes/intranet/images/icons/notification.png rename to www/images/icons/notification.png diff --git a/www/themes/intranet/images/icons/reports.png b/www/images/icons/reports.png similarity index 100% rename from www/themes/intranet/images/icons/reports.png rename to www/images/icons/reports.png diff --git a/www/themes/intranet/images/icons/small/black/calendar.png b/www/images/icons/small/black/calendar.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/calendar.png rename to www/images/icons/small/black/calendar.png diff --git a/www/themes/intranet/images/icons/small/black/chat.png b/www/images/icons/small/black/chat.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/chat.png rename to www/images/icons/small/black/chat.png diff --git a/www/themes/intranet/images/icons/small/black/check.png b/www/images/icons/small/black/check.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/check.png rename to www/images/icons/small/black/check.png diff --git a/www/themes/intranet/images/icons/small/black/close.png b/www/images/icons/small/black/close.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/close.png rename to www/images/icons/small/black/close.png diff --git a/www/themes/intranet/images/icons/small/black/contact.png b/www/images/icons/small/black/contact.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/contact.png rename to www/images/icons/small/black/contact.png diff --git a/www/themes/intranet/images/icons/small/black/document.png b/www/images/icons/small/black/document.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/document.png rename to www/images/icons/small/black/document.png diff --git a/www/themes/intranet/images/icons/small/black/edit.png b/www/images/icons/small/black/edit.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/edit.png rename to www/images/icons/small/black/edit.png diff --git a/www/themes/intranet/images/icons/small/black/mail.png b/www/images/icons/small/black/mail.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/mail.png rename to www/images/icons/small/black/mail.png diff --git a/www/themes/intranet/images/icons/small/black/minus.png b/www/images/icons/small/black/minus.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/minus.png rename to www/images/icons/small/black/minus.png diff --git a/www/themes/intranet/images/icons/small/black/music.png b/www/images/icons/small/black/music.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/music.png rename to www/images/icons/small/black/music.png diff --git a/www/themes/intranet/images/icons/small/black/people.png b/www/images/icons/small/black/people.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/people.png rename to www/images/icons/small/black/people.png diff --git a/www/themes/intranet/images/icons/small/black/plus.png b/www/images/icons/small/black/plus.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/plus.png rename to www/images/icons/small/black/plus.png diff --git a/www/themes/intranet/images/icons/small/black/save.png b/www/images/icons/small/black/save.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/save.png rename to www/images/icons/small/black/save.png diff --git a/www/themes/intranet/images/icons/small/black/search.png b/www/images/icons/small/black/search.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/search.png rename to www/images/icons/small/black/search.png diff --git a/www/themes/intranet/images/icons/small/black/settings.png b/www/images/icons/small/black/settings.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/settings.png rename to www/images/icons/small/black/settings.png diff --git a/www/themes/intranet/images/icons/small/black/star.png b/www/images/icons/small/black/star.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/star.png rename to www/images/icons/small/black/star.png diff --git a/www/themes/intranet/images/icons/small/black/tag.png b/www/images/icons/small/black/tag.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/tag.png rename to www/images/icons/small/black/tag.png diff --git a/www/themes/intranet/images/icons/small/black/user.png b/www/images/icons/small/black/user.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/user.png rename to www/images/icons/small/black/user.png diff --git a/www/themes/intranet/images/icons/small/black/video.png b/www/images/icons/small/black/video.png similarity index 100% rename from www/themes/intranet/images/icons/small/black/video.png rename to www/images/icons/small/black/video.png diff --git a/www/themes/intranet/images/icons/small/white/calendar.png b/www/images/icons/small/white/calendar.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/calendar.png rename to www/images/icons/small/white/calendar.png diff --git a/www/themes/intranet/images/icons/small/white/chat.png b/www/images/icons/small/white/chat.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/chat.png rename to www/images/icons/small/white/chat.png diff --git a/www/themes/intranet/images/icons/small/white/check.png b/www/images/icons/small/white/check.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/check.png rename to www/images/icons/small/white/check.png diff --git a/www/themes/intranet/images/icons/small/white/close.png b/www/images/icons/small/white/close.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/close.png rename to www/images/icons/small/white/close.png diff --git a/www/themes/intranet/images/icons/small/white/contact.png b/www/images/icons/small/white/contact.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/contact.png rename to www/images/icons/small/white/contact.png diff --git a/www/themes/intranet/images/icons/small/white/document.png b/www/images/icons/small/white/document.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/document.png rename to www/images/icons/small/white/document.png diff --git a/www/themes/intranet/images/icons/small/white/edit.png b/www/images/icons/small/white/edit.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/edit.png rename to www/images/icons/small/white/edit.png diff --git a/www/themes/intranet/images/icons/small/white/mail.png b/www/images/icons/small/white/mail.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/mail.png rename to www/images/icons/small/white/mail.png diff --git a/www/themes/intranet/images/icons/small/white/minus.png b/www/images/icons/small/white/minus.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/minus.png rename to www/images/icons/small/white/minus.png diff --git a/www/themes/intranet/images/icons/small/white/music.png b/www/images/icons/small/white/music.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/music.png rename to www/images/icons/small/white/music.png diff --git a/www/themes/intranet/images/icons/small/white/people.png b/www/images/icons/small/white/people.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/people.png rename to www/images/icons/small/white/people.png diff --git a/www/themes/intranet/images/icons/small/white/plus.png b/www/images/icons/small/white/plus.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/plus.png rename to www/images/icons/small/white/plus.png diff --git a/www/themes/intranet/images/icons/small/white/save.png b/www/images/icons/small/white/save.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/save.png rename to www/images/icons/small/white/save.png diff --git a/www/themes/intranet/images/icons/small/white/search.png b/www/images/icons/small/white/search.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/search.png rename to www/images/icons/small/white/search.png diff --git a/www/themes/intranet/images/icons/small/white/settings.png b/www/images/icons/small/white/settings.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/settings.png rename to www/images/icons/small/white/settings.png diff --git a/www/themes/intranet/images/icons/small/white/star.png b/www/images/icons/small/white/star.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/star.png rename to www/images/icons/small/white/star.png diff --git a/www/themes/intranet/images/icons/small/white/tag.png b/www/images/icons/small/white/tag.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/tag.png rename to www/images/icons/small/white/tag.png diff --git a/www/themes/intranet/images/icons/small/white/user.png b/www/images/icons/small/white/user.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/user.png rename to www/images/icons/small/white/user.png diff --git a/www/themes/intranet/images/icons/small/white/video.png b/www/images/icons/small/white/video.png similarity index 100% rename from www/themes/intranet/images/icons/small/white/video.png rename to www/images/icons/small/white/video.png diff --git a/www/themes/intranet/images/icons/statistics.png b/www/images/icons/statistics.png similarity index 100% rename from www/themes/intranet/images/icons/statistics.png rename to www/images/icons/statistics.png diff --git a/www/themes/intranet/images/icons/success.png b/www/images/icons/success.png similarity index 100% rename from www/themes/intranet/images/icons/success.png rename to www/images/icons/success.png diff --git a/www/themes/intranet/images/icons/table.png b/www/images/icons/table.png similarity index 100% rename from www/themes/intranet/images/icons/table.png rename to www/images/icons/table.png diff --git a/www/themes/intranet/images/icons/trash.png b/www/images/icons/trash.png similarity index 100% rename from www/themes/intranet/images/icons/trash.png rename to www/images/icons/trash.png diff --git a/www/themes/intranet/images/icons/users.png b/www/images/icons/users.png similarity index 100% rename from www/themes/intranet/images/icons/users.png rename to www/images/icons/users.png diff --git a/www/themes/intranet/images/icons/vbutton.png b/www/images/icons/vbutton.png similarity index 100% rename from www/themes/intranet/images/icons/vbutton.png rename to www/images/icons/vbutton.png diff --git a/www/themes/intranet/images/icons/warning.png b/www/images/icons/warning.png similarity index 100% rename from www/themes/intranet/images/icons/warning.png rename to www/images/icons/warning.png diff --git a/www/themes/intranet/images/imghover.png b/www/images/imghover.png similarity index 100% rename from www/themes/intranet/images/imghover.png rename to www/images/imghover.png diff --git a/www/themes/intranet/images/important.gif b/www/images/important.gif similarity index 100% rename from www/themes/intranet/images/important.gif rename to www/images/important.gif diff --git a/www/themes/intranet/images/info.gif b/www/images/info.gif similarity index 100% rename from www/themes/intranet/images/info.gif rename to www/images/info.gif diff --git a/www/themes/intranet/images/jquery.wysiwyg.gif b/www/images/jquery.wysiwyg.gif similarity index 100% rename from www/themes/intranet/images/jquery.wysiwyg.gif rename to www/images/jquery.wysiwyg.gif diff --git a/www/themes/intranet/images/leftbg.png b/www/images/leftbg.png similarity index 100% rename from www/themes/intranet/images/leftbg.png rename to www/images/leftbg.png diff --git a/www/themes/intranet/images/loaders/loader1.gif b/www/images/loaders/loader1.gif similarity index 100% rename from www/themes/intranet/images/loaders/loader1.gif rename to www/images/loaders/loader1.gif diff --git a/www/themes/intranet/images/loaders/loader10.gif b/www/images/loaders/loader10.gif similarity index 100% rename from www/themes/intranet/images/loaders/loader10.gif rename to www/images/loaders/loader10.gif diff --git a/www/themes/intranet/images/loaders/loader2.gif b/www/images/loaders/loader2.gif similarity index 100% rename from www/themes/intranet/images/loaders/loader2.gif rename to www/images/loaders/loader2.gif diff --git a/www/themes/intranet/images/loaders/loader3.gif b/www/images/loaders/loader3.gif similarity index 100% rename from www/themes/intranet/images/loaders/loader3.gif rename to www/images/loaders/loader3.gif diff --git a/www/themes/intranet/images/loaders/loader4.gif b/www/images/loaders/loader4.gif similarity index 100% rename from www/themes/intranet/images/loaders/loader4.gif rename to www/images/loaders/loader4.gif diff --git a/www/themes/intranet/images/loaders/loader5.gif b/www/images/loaders/loader5.gif similarity index 100% rename from www/themes/intranet/images/loaders/loader5.gif rename to www/images/loaders/loader5.gif diff --git a/www/themes/intranet/images/loaders/loader6.gif b/www/images/loaders/loader6.gif similarity index 100% rename from www/themes/intranet/images/loaders/loader6.gif rename to www/images/loaders/loader6.gif diff --git a/www/themes/intranet/images/loaders/loader7.gif b/www/images/loaders/loader7.gif similarity index 100% rename from www/themes/intranet/images/loaders/loader7.gif rename to www/images/loaders/loader7.gif diff --git a/www/themes/intranet/images/loaders/loader8.gif b/www/images/loaders/loader8.gif similarity index 100% rename from www/themes/intranet/images/loaders/loader8.gif rename to www/images/loaders/loader8.gif diff --git a/www/themes/intranet/images/loaders/loader9.gif b/www/images/loaders/loader9.gif similarity index 100% rename from www/themes/intranet/images/loaders/loader9.gif rename to www/images/loaders/loader9.gif diff --git a/www/themes/intranet/images/loginbox.png b/www/images/loginbox.png similarity index 100% rename from www/themes/intranet/images/loginbox.png rename to www/images/loginbox.png diff --git a/www/themes/intranet/images/logo.png b/www/images/logo.png similarity index 100% rename from www/themes/intranet/images/logo.png rename to www/images/logo.png diff --git a/www/themes/intranet/images/logo2.png b/www/images/logo2.png similarity index 100% rename from www/themes/intranet/images/logo2.png rename to www/images/logo2.png diff --git a/www/themes/intranet/images/passwordfield.png b/www/images/passwordfield.png similarity index 100% rename from www/themes/intranet/images/passwordfield.png rename to www/images/passwordfield.png diff --git a/www/themes/intranet/images/prevnext.png b/www/images/prevnext.png similarity index 100% rename from www/themes/intranet/images/prevnext.png rename to www/images/prevnext.png diff --git a/www/themes/intranet/images/searchbar.png b/www/images/searchbar.png similarity index 100% rename from www/themes/intranet/images/searchbar.png rename to www/images/searchbar.png diff --git a/www/themes/intranet/images/searchicon.png b/www/images/searchicon.png similarity index 100% rename from www/themes/intranet/images/searchicon.png rename to www/images/searchicon.png diff --git a/www/themes/intranet/images/separator.png b/www/images/separator.png similarity index 100% rename from www/themes/intranet/images/separator.png rename to www/images/separator.png diff --git a/www/themes/intranet/images/separator2.png b/www/images/separator2.png similarity index 100% rename from www/themes/intranet/images/separator2.png rename to www/images/separator2.png diff --git a/www/themes/intranet/images/sort_asc.png b/www/images/sort_asc.png similarity index 100% rename from www/themes/intranet/images/sort_asc.png rename to www/images/sort_asc.png diff --git a/www/themes/intranet/images/sort_asc_disabled.png b/www/images/sort_asc_disabled.png similarity index 100% rename from www/themes/intranet/images/sort_asc_disabled.png rename to www/images/sort_asc_disabled.png diff --git a/www/themes/intranet/images/sort_both.png b/www/images/sort_both.png similarity index 100% rename from www/themes/intranet/images/sort_both.png rename to www/images/sort_both.png diff --git a/www/themes/intranet/images/sort_desc.png b/www/images/sort_desc.png similarity index 100% rename from www/themes/intranet/images/sort_desc.png rename to www/images/sort_desc.png diff --git a/www/themes/intranet/images/sort_desc_disabled.png b/www/images/sort_desc_disabled.png similarity index 100% rename from www/themes/intranet/images/sort_desc_disabled.png rename to www/images/sort_desc_disabled.png diff --git a/www/themes/intranet/images/tabmenubg.png b/www/images/tabmenubg.png similarity index 100% rename from www/themes/intranet/images/tabmenubg.png rename to www/images/tabmenubg.png diff --git a/www/themes/intranet/images/texturebg.png b/www/images/texturebg.png similarity index 100% rename from www/themes/intranet/images/texturebg.png rename to www/images/texturebg.png diff --git a/www/themes/intranet/images/thead.png b/www/images/thead.png similarity index 100% rename from www/themes/intranet/images/thead.png rename to www/images/thead.png diff --git a/www/themes/intranet/images/title.gif b/www/images/title.gif similarity index 100% rename from www/themes/intranet/images/title.gif rename to www/images/title.gif diff --git a/www/themes/intranet/images/titlebg.png b/www/images/titlebg.png similarity index 100% rename from www/themes/intranet/images/titlebg.png rename to www/images/titlebg.png diff --git a/www/themes/intranet/images/toggle.png b/www/images/toggle.png similarity index 100% rename from www/themes/intranet/images/toggle.png rename to www/images/toggle.png diff --git a/www/themes/intranet/images/toggle2.png b/www/images/toggle2.png similarity index 100% rename from www/themes/intranet/images/toggle2.png rename to www/images/toggle2.png diff --git a/www/themes/intranet/images/usernamefield.png b/www/images/usernamefield.png similarity index 100% rename from www/themes/intranet/images/usernamefield.png rename to www/images/usernamefield.png diff --git a/www/themes/intranet/images/viewdelete.png b/www/images/viewdelete.png similarity index 100% rename from www/themes/intranet/images/viewdelete.png rename to www/images/viewdelete.png diff --git a/www/themes/intranet/js/custom/calendar.js b/www/js/custom/calendar.js similarity index 100% rename from www/themes/intranet/js/custom/calendar.js rename to www/js/custom/calendar.js diff --git a/www/themes/intranet/js/custom/dashboard.js b/www/js/custom/dashboard.js similarity index 100% rename from www/themes/intranet/js/custom/dashboard.js rename to www/js/custom/dashboard.js diff --git a/www/themes/intranet/js/custom/elements.js b/www/js/custom/elements.js similarity index 100% rename from www/themes/intranet/js/custom/elements.js rename to www/js/custom/elements.js diff --git a/www/themes/intranet/js/custom/gallery.js b/www/js/custom/gallery.js similarity index 100% rename from www/themes/intranet/js/custom/gallery.js rename to www/js/custom/gallery.js diff --git a/www/themes/intranet/js/custom/general.js b/www/js/custom/general.js similarity index 100% rename from www/themes/intranet/js/custom/general.js rename to www/js/custom/general.js diff --git a/www/themes/intranet/js/custom/reports.js b/www/js/custom/reports.js similarity index 100% rename from www/themes/intranet/js/custom/reports.js rename to www/js/custom/reports.js diff --git a/www/themes/intranet/js/custom/users.js b/www/js/custom/users.js similarity index 100% rename from www/themes/intranet/js/custom/users.js rename to www/js/custom/users.js diff --git a/www/themes/intranet/js/plugins/ColumnFilterWidgets.js b/www/js/plugins/ColumnFilterWidgets.js similarity index 100% rename from www/themes/intranet/js/plugins/ColumnFilterWidgets.js rename to www/js/plugins/ColumnFilterWidgets.js diff --git a/www/themes/intranet/js/plugins/FixedHeader.js b/www/js/plugins/FixedHeader.js similarity index 100% rename from www/themes/intranet/js/plugins/FixedHeader.js rename to www/js/plugins/FixedHeader.js diff --git a/www/themes/intranet/js/plugins/FixedHeader.min.js b/www/js/plugins/FixedHeader.min.js similarity index 100% rename from www/themes/intranet/js/plugins/FixedHeader.min.js rename to www/js/plugins/FixedHeader.min.js diff --git a/www/themes/intranet/js/plugins/colorpicker.js b/www/js/plugins/colorpicker.js similarity index 100% rename from www/themes/intranet/js/plugins/colorpicker.js rename to www/js/plugins/colorpicker.js diff --git a/www/themes/intranet/js/plugins/elfinder.min.js b/www/js/plugins/elfinder.min.js similarity index 100% rename from www/themes/intranet/js/plugins/elfinder.min.js rename to www/js/plugins/elfinder.min.js diff --git a/www/themes/intranet/js/plugins/excanvas.min.js b/www/js/plugins/excanvas.min.js similarity index 100% rename from www/themes/intranet/js/plugins/excanvas.min.js rename to www/js/plugins/excanvas.min.js diff --git a/www/themes/intranet/js/plugins/fullcalendar.min.js b/www/js/plugins/fullcalendar.min.js similarity index 100% rename from www/themes/intranet/js/plugins/fullcalendar.min.js rename to www/js/plugins/fullcalendar.min.js diff --git a/www/themes/intranet/js/plugins/jquery-1.7.min.js b/www/js/plugins/jquery-1.7.min.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery-1.7.min.js rename to www/js/plugins/jquery-1.7.min.js diff --git a/www/themes/intranet/js/plugins/jquery-ui-1.8.16.custom.min.js b/www/js/plugins/jquery-ui-1.8.16.custom.min.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery-ui-1.8.16.custom.min.js rename to www/js/plugins/jquery-ui-1.8.16.custom.min.js diff --git a/www/themes/intranet/js/plugins/jquery.alerts.js b/www/js/plugins/jquery.alerts.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery.alerts.js rename to www/js/plugins/jquery.alerts.js diff --git a/www/themes/intranet/js/plugins/jquery.colorbox-min.js b/www/js/plugins/jquery.colorbox-min.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery.colorbox-min.js rename to www/js/plugins/jquery.colorbox-min.js diff --git a/www/themes/intranet/js/plugins/jquery.dataTables.columnFilter.js b/www/js/plugins/jquery.dataTables.columnFilter.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery.dataTables.columnFilter.js rename to www/js/plugins/jquery.dataTables.columnFilter.js diff --git a/www/themes/intranet/js/plugins/jquery.dataTables.js b/www/js/plugins/jquery.dataTables.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery.dataTables.js rename to www/js/plugins/jquery.dataTables.js diff --git a/www/themes/intranet/js/plugins/jquery.dataTables.min.js b/www/js/plugins/jquery.dataTables.min.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery.dataTables.min.js rename to www/js/plugins/jquery.dataTables.min.js diff --git a/www/themes/intranet/js/plugins/jquery.flot.min.js b/www/js/plugins/jquery.flot.min.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery.flot.min.js rename to www/js/plugins/jquery.flot.min.js diff --git a/www/themes/intranet/js/plugins/jquery.flot.pie.min.js b/www/js/plugins/jquery.flot.pie.min.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery.flot.pie.min.js rename to www/js/plugins/jquery.flot.pie.min.js diff --git a/www/themes/intranet/js/plugins/jquery.jeditable.mini.js b/www/js/plugins/jquery.jeditable.mini.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery.jeditable.mini.js rename to www/js/plugins/jquery.jeditable.mini.js diff --git a/www/themes/intranet/js/plugins/jquery.jgrowl.js b/www/js/plugins/jquery.jgrowl.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery.jgrowl.js rename to www/js/plugins/jquery.jgrowl.js diff --git a/www/themes/intranet/js/plugins/jquery.validate.min.js b/www/js/plugins/jquery.validate.min.js similarity index 100% rename from www/themes/intranet/js/plugins/jquery.validate.min.js rename to www/js/plugins/jquery.validate.min.js diff --git a/www/themes/intranet/js/plugins/wysiwyg/jquery.wysiwyg.js b/www/js/plugins/wysiwyg/jquery.wysiwyg.js similarity index 100% rename from www/themes/intranet/js/plugins/wysiwyg/jquery.wysiwyg.js rename to www/js/plugins/wysiwyg/jquery.wysiwyg.js diff --git a/www/themes/intranet/js/plugins/wysiwyg/wysiwyg.colorpicker.js b/www/js/plugins/wysiwyg/wysiwyg.colorpicker.js similarity index 100% rename from www/themes/intranet/js/plugins/wysiwyg/wysiwyg.colorpicker.js rename to www/js/plugins/wysiwyg/wysiwyg.colorpicker.js diff --git a/www/themes/intranet/js/plugins/wysiwyg/wysiwyg.cssWrap.js b/www/js/plugins/wysiwyg/wysiwyg.cssWrap.js similarity index 100% rename from www/themes/intranet/js/plugins/wysiwyg/wysiwyg.cssWrap.js rename to www/js/plugins/wysiwyg/wysiwyg.cssWrap.js diff --git a/www/themes/intranet/js/plugins/wysiwyg/wysiwyg.image.js b/www/js/plugins/wysiwyg/wysiwyg.image.js similarity index 100% rename from www/themes/intranet/js/plugins/wysiwyg/wysiwyg.image.js rename to www/js/plugins/wysiwyg/wysiwyg.image.js diff --git a/www/themes/intranet/js/plugins/wysiwyg/wysiwyg.link.js b/www/js/plugins/wysiwyg/wysiwyg.link.js similarity index 100% rename from www/themes/intranet/js/plugins/wysiwyg/wysiwyg.link.js rename to www/js/plugins/wysiwyg/wysiwyg.link.js diff --git a/www/themes/intranet/js/plugins/wysiwyg/wysiwyg.table.js b/www/js/plugins/wysiwyg/wysiwyg.table.js similarity index 100% rename from www/themes/intranet/js/plugins/wysiwyg/wysiwyg.table.js rename to www/js/plugins/wysiwyg/wysiwyg.table.js diff --git a/www/protected/config/main.php b/www/protected/config/main.php index adbf16b..0c7b8fa 100644 --- a/www/protected/config/main.php +++ b/www/protected/config/main.php @@ -8,6 +8,8 @@ return array( 'basePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..', 'name'=>'My Web Application', + 'sourceLanguage' =>'en_US', + 'language' =>'es', // preloading 'log' component 'preload'=>array('log'), @@ -16,6 +18,7 @@ return array( 'import'=>array( 'application.models.*', 'application.components.*', + 'ext.PageSize.*', ), 'modules'=>array( @@ -32,60 +35,59 @@ return array( // application components 'components'=>array( - 'user'=>array( - // enable cookie-based authentication - 'allowAutoLogin'=>true, - ), - // uncomment the following to enable URLs in path-format - /* - 'urlManager'=>array( - 'urlFormat'=>'path', - 'rules'=>array( - '/'=>'/view', - '//'=>'/', - '/'=>'/', - ), - ), - */ - /*'db'=>array( - 'connectionString' => 'sqlite:'.dirname(__FILE__).'/../data/testdrive.db', - ),*/ - // uncomment the following to use a MySQL database - - 'db'=>array( - 'connectionString' => 'mysql:host=localhost;dbname=intranet_dev', - 'emulatePrepare' => true, - 'username' => 'root', - 'password' => '', - 'charset' => 'utf8', - ), - - 'errorHandler'=>array( - // use 'site/error' action to display errors - 'errorAction'=>'site/error', - ), - 'log'=>array( - 'class'=>'CLogRouter', - 'routes'=>array( - array( - 'class'=>'CFileLogRoute', - 'levels'=>'error, warning', - ), - // uncomment the following to show log messages on web pages - /* - array( - 'class'=>'CWebLogRoute', - ), - */ - ), - ), + 'user'=>array( + // enable cookie-based authentication + 'allowAutoLogin'=>true, + ), + // uncomment the following to enable URLs in path-format + 'urlManager'=>array( + 'urlFormat'=>'path', + 'rules'=>array( + '/'=>'/view', + '//'=>'/', + '/'=>'/', + ), + ), + 'db'=>array( + 'connectionString' => 'mysql:host=localhost;dbname=intranet_dev', + 'emulatePrepare' => true, + 'username' => 'root', + 'password' => '', + 'charset' => 'utf8', + ), + 'errorHandler'=>array( + // use 'site/error' action to display errors + 'errorAction'=>'site/error', + ), + 'log'=>array( + 'class'=>'CLogRouter', + 'routes'=>array( + array( + 'class'=>'CFileLogRoute', + 'levels'=>'error, warning', + ), + // uncomment the following to show log messages on web pages + /* + array( + 'class'=>'CWebLogRoute', + ), + */ + ), + ), + 'widgetFactory'=>array( + 'widgets'=>array( + 'CLinkPager'=>array( + 'cssFile'=>(strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css/pager.css', + ), + ), + ), ), // application-level parameters that can be accessed // using Yii::app()->params['paramName'] 'params'=>array( - // this is used in contact page - 'adminEmail'=>'webmaster@example.com', - ), - 'theme'=>'intranet', + // PageSize extension + 'defaultPageSize' => 10, + 'pageSizeOptions' => array(10=>10,20=>20,50=>50,100=>100), + ), ); \ No newline at end of file diff --git a/www/protected/controllers/CandidatoController - copia.php b/www/protected/controllers/CandidatoController - copia.php new file mode 100644 index 0000000..3946b0d --- /dev/null +++ b/www/protected/controllers/CandidatoController - copia.php @@ -0,0 +1,208 @@ +array('index','view','create','update','delete'), + 'users'=>array('@'), + ), + array('allow', // allow admin user to perform 'admin' and 'delete' actions + 'actions'=>array('admin'), + 'users'=>array('admin'), + ), + array('deny', // deny all users + 'users'=>array('*'), + ), + ); + } + + /** + * Displays a particular model. + * @param integer $id the ID of the model to be displayed + */ + public function actionView($id) + { + $this->render('view',array( + 'model'=>$this->loadModel($id), + )); + } + + /** + * Creates a new model. + * If creation is successful, the browser will be redirected to the 'view' page. + */ + public function actionCreate() + { + $model=new Candidato; + + // Uncomment the following line if AJAX validation is needed + //$this->performAjaxValidation($model); + + if(isset($_POST['Candidato'])) + { + $model->attributes=$_POST['Candidato']; + $foto=CUploadedFile::getInstance($model,'foto'); + + if ($model->save()) { + $this->guardarFoto($model->id, $foto); + $this->redirect(array('view','id'=>$model->id)); + } + } + + $this->render('create',array( + 'model'=>$model, + )); + } + + /** + * Updates a particular model. + * If update is successful, the browser will be redirected to the 'view' page. + * @param integer $id the ID of the model to be updated + */ + public function actionUpdate($id) + { + $model=$this->loadModel($id); + + // Uncomment the following line if AJAX validation is needed + //$this->performAjaxValidation($model); + + if(isset($_POST['Candidato'])) + { + $foto=CUploadedFile::getInstance($model,'foto'); + $model->attributes=$_POST['Candidato']; + if($model->save()) { + $this->guardarFoto($model->id, $foto); + $this->redirect(array('view','id'=>$model->id)); + } + } + + $this->render('update',array( + 'model'=>$model, + )); + } + + /** + * Deletes a particular model. + * If deletion is successful, the browser will be redirected to the 'admin' page. + * @param integer $id the ID of the model to be deleted + */ + public function actionDelete($id) + { + if(Yii::app()->request->isPostRequest) + { + // we only allow deletion via POST request + $this->loadModel($id)->delete(); + $this->borrarFoto($id); + + // if AJAX request (triggered by deletion via admin grid view), we should not redirect the browser + if(!isset($_GET['ajax'])) + $this->redirect(isset($_POST['returnUrl']) ? $_POST['returnUrl'] : array('admin')); + } + else + throw new CHttpException(400,'Invalid request. Please do not repeat this request again.'); + } + + /** + * Lists all models. + */ + public function actionIndex() + { + $model=new Candidato('search'); + $model->unsetAttributes(); // clear any default values + if(isset($_GET['Candidato'])) + $model->attributes=$_GET['Candidato']; + + $this->render('index',array( + 'model'=>$model, + )); + } + + /** + * Manages all models. + */ + public function actionAdmin() + { + $model=new Candidato('search'); + $model->unsetAttributes(); // clear any default values + if(isset($_GET['Candidato'])) + $model->attributes=$_GET['Candidato']; + + $this->render('admin',array( + 'model'=>$model, + )); + } + + /** + * Returns the data model based on the primary key given in the GET variable. + * If the data model is not found, an HTTP exception will be raised. + * @param integer the ID of the model to be loaded + */ + public function loadModel($id) + { + $model=Candidato::model()->findByPk($id); + if($model===null) + throw new CHttpException(404,'The requested page does not exist.'); + + $model->foto = $this->buscarFoto($id); + return $model; + } + + /** + * Performs the AJAX validation. + * @param CModel the model to be validated + */ + protected function performAjaxValidation($model) + { + if(isset($_POST['ajax']) && $_POST['ajax']==='candidato-form') + { + echo CActiveForm::validate($model); + Yii::app()->end(); + } + } + + private function guardarFoto($id, $foto) { + if (!is_null($foto)) { + $path = Yii::app()->basePath.'/../fotos/'; + $fichero = $id.'.jpg'; + $foto->saveAs($path.$fichero); + } + } + + private function borrarFoto($id) { + $path = Yii::app()->basePath.'/../fotos/'; + $fichero = $id.'.jpg'; + if (file_exists($path.$fichero)) + unlink($path.$fichero); + } + + private function buscarFoto($id) { + $path = Yii::app()->basePath.'/../fotos/'; + $fichero = $id.'.jpg'; + $url = Yii::app()->request->baseUrl.'/fotos/'; + return file_exists($path.$fichero) ? $url.$fichero : $url.'no_avatar.png'; + } +} diff --git a/www/protected/controllers/CandidatoController.php b/www/protected/controllers/CandidatoController.php index 1e692da..fa312b6 100644 --- a/www/protected/controllers/CandidatoController.php +++ b/www/protected/controllers/CandidatoController.php @@ -25,19 +25,19 @@ class CandidatoController extends Controller */ public function accessRules() { - return array( - array('allow', // allow authenticated user to perform 'create' and 'update' actions - 'actions'=>array('index','view','create','update','delete'), - 'users'=>array('@'), - ), - array('allow', // allow admin user to perform 'admin' and 'delete' actions - 'actions'=>array('admin'), - 'users'=>array('admin'), - ), - array('deny', // deny all users - 'users'=>array('*'), - ), - ); + return array( + array('allow', // allow authenticated user to perform 'create' and 'update' actions + 'actions'=>array('index','view','create','update','delete'), + 'users'=>array('@'), + ), + array('allow', // allow admin user to perform 'admin' and 'delete' actions + 'actions'=>array('admin'), + 'users'=>array('admin'), + ), + array('deny', // deny all users + 'users'=>array('*'), + ), + ); } /** @@ -57,25 +57,94 @@ class CandidatoController extends Controller */ public function actionCreate() { - $model=new Candidato; + Yii::import('ext.multimodelform.MultiModelForm'); + + $model = new Candidato; + $idioma = new CandidatoIdioma(); + $titulacion = new CandidatoTitulacion(); + + $idiomasValidos = array(); + $titulacionesValidas = array(); + + // Uncomment the following line if AJAX validation is needed + //$this->performAjaxValidation($model); - // Uncomment the following line if AJAX validation is needed - //$this->performAjaxValidation($model); + /*if(isset($_POST['Candidato'])) + { + $model->attributes=$_POST['Candidato']; + $foto=CUploadedFile::getInstance($model,'foto'); - if(isset($_POST['Candidato'])) - { - $model->attributes=$_POST['Candidato']; - $foto=CUploadedFile::getInstance($model,'foto'); + if ($model->validate()) + { + $foundInvalidChild = false; + $arrayIdiomas = array(); + if(isset($_POST['CandidatoIdioma'])) + { + foreach ($_POST['CandidatoIdioma'] as $idioma) + { + $CandidatoIdioma = new CandidatoIdioma; + $CandidatoIdioma->attributes = $idioma; - if ($model->save()) { - $this->guardarFoto($model->id, $foto); - $this->redirect(array('view','id'=>$model->id)); + if ($model->id) + $CandidatoIdioma->candidato_id = $model->id; + + if (!$CandidatoIdioma->validate()) + $foundInvalidChild = true; + + $arrayIdiomas[] = $CandidatoIdioma; } - } + } + } - $this->render('create',array( - 'model'=>$model, - )); + if (!$foundInvalidChild && $model->save()) { + $this->guardarFoto($model->id, $foto); + + // Guardar los idiomas + foreach($arrayIdiomas as $CandidatoIdioma) + { + $CandidatoIdioma->candidato_id = $model->id; + $CandidatoIdioma->save(); + } + + Yii::app()->user->setFlash('success', "Candidato dado de alta correctamente."); + $this->redirect(array('index')); + } + }*/ + + if (isset($_POST['Candidato'])) { + $model->attributes=$_POST['Candidato']; + $foto=CUploadedFile::getInstance($model,'foto'); + + if ($model->validate()) { + $foundInvalidChild = false; + + if (!MultiModelForm::validate($model, $idiomasValidos, $idiomasBorrados)) + $foundInvalidChild = true; + + if (!MultiModelForm::validate($model, $titulacionesValidas, $titulacionesBorradas)) + $foundInvalidChild = true; + } + + if (!$foundInvalidChild && $model->save() ) { + $masterValues = array ('candidato_id'=>$model->id); + + if (MultiModelForm::save($model, $idiomasValidos, $idiomasBorrados, $masterValues) && + MultiModelForm::save($model, $titulacionesValidas, $titulacionesBorradas, $masterValues)) + { + $this->guardarFoto($model->id, $foto); + Yii::app()->user->setFlash('success', "Candidato dado de alta correctamente."); + $this->redirect(array('index')); + } + } + } + + $this->render('create',array( + 'model'=>$model, + 'idioma'=>$idioma, + 'titulacion'=>$titulacion, + 'idiomasValidos'=>$idiomasValidos, + 'titulacionesValidas'=>$titulacionesValidas, + )); } /** @@ -85,24 +154,83 @@ class CandidatoController extends Controller */ public function actionUpdate($id) { - $model=$this->loadModel($id); + Yii::import('ext.multimodelform.MultiModelForm'); + + $model=$this->loadModel($id); + $idioma=new CandidatoIdioma(); + $titulacion = new CandidatoTitulacion(); + + $idiomasValidos = array(); + $titulacionesValidas = array(); - // Uncomment the following line if AJAX validation is needed - //$this->performAjaxValidation($model); + // Uncomment the following line if AJAX validation is needed + //$this->performAjaxValidation($model); - if(isset($_POST['Candidato'])) - { - $foto=CUploadedFile::getInstance($model,'foto'); - $model->attributes=$_POST['Candidato']; - if($model->save()) { - $this->guardarFoto($model->id, $foto); - $this->redirect(array('view','id'=>$model->id)); + /*if(isset($_POST['Candidato'])) + { + $foto=CUploadedFile::getInstance($model,'foto'); + $model->attributes=$_POST['Candidato']; + + if ($model->validate()) + { + $foundInvalidChild = false; + $arrayIdiomas = array(); + if(isset($_POST['CandidatoIdioma'])) + { + foreach ($_POST['CandidatoIdioma'] as $idioma) + { + //$CandidatoIdioma = CandidatoIdioma::model()->findB; + //CandidatoIdioma::model()->deleteAllByAttributes($arrayIdiomas) + + $CandidatoIdioma->attributes = $idioma; + + + if ($model->id) + $CandidatoIdioma->candidato_id = $model->id; + + if (!$CandidatoIdioma->validate()) + $foundInvalidChild = true; + + $arrayIdiomas[] = $CandidatoIdioma; + } } - } + } - $this->render('update',array( - 'model'=>$model, - )); + if (!$foundInvalidChild && $model->save()) { + $this->guardarFoto($model->id, $foto); + + // Guardar los idiomas + foreach($arrayIdiomas as $CandidatoIdioma) + { + $CandidatoIdioma->candidato_id = $model->id; + $CandidatoIdioma->save(); + } + + Yii::app()->user->setFlash('success', "Candidato actualizado correctamente."); + //$this->redirect(array('view','id'=>$model->id)); + } + }*/ + + if(isset($_POST['Candidato'])) { + $foto=CUploadedFile::getInstance($model,'foto'); + $model->attributes=$_POST['Candidato']; + + //the value for the foreign key 'candidato_id' + $masterValues = array ('candidato_id'=>$model->id); + + //Save the master model after saving valid members + if (MultiModelForm::save($idioma, $validatedIdiomas, $deleteIdiomas, $masterValues) && $model->save() ) { + $this->guardarFoto($model->id, $foto); + Yii::app()->user->setFlash('success', "Candidato actualizado correctamente."); + //$this->redirect(array('view','id'=>$model->id)); + } + } + + $this->render('update',array( + 'model'=>$model, + 'idioma'=>$idioma, + 'validatedIdiomas'=>$validatedIdiomas, + )); } /** @@ -120,7 +248,7 @@ class CandidatoController extends Controller // if AJAX request (triggered by deletion via admin grid view), we should not redirect the browser if(!isset($_GET['ajax'])) - $this->redirect(isset($_POST['returnUrl']) ? $_POST['returnUrl'] : array('admin')); + $this->redirect(isset($_POST['returnUrl']) ? $_POST['returnUrl'] : array('index')); } else throw new CHttpException(400,'Invalid request. Please do not repeat this request again.'); @@ -131,15 +259,86 @@ class CandidatoController extends Controller */ public function actionIndex() { - $model=new Candidato('search'); - $model->unsetAttributes(); // clear any default values - if(isset($_GET['Candidato'])) - $model->attributes=$_GET['Candidato']; + $model=new Candidato('search'); + $model->unsetAttributes(); // clear any default values + /*$columns = array( + array( + 'type' => 'html', + 'name' => 'nombreApellidos', + 'value' => 'CHtml::link(CHtml::encode($data->nombreApellidos), array("update", "id"=>$data->id));', + 'headerHtmlOptions'=>array( + 'class' => 'head0 sorting', + ), + ), + array( + 'type' => 'html', + 'name' => 'estado', + 'value' => 'CHtml::link(CHtml::encode($data->estado), "#", array("class" => $data->cssClassEstado));', + 'headerHtmlOptions'=>array( + 'class' => 'head1 sorting', + ), + ), - $this->render('index',array( - 'model'=>$model, - )); - } + array( + 'name' => 'id', + 'headerHtmlOptions'=>array( + 'class' => 'head0 sorting', + ), + ), + array( + 'name' => 'fecha_modificacion', + 'headerHtmlOptions'=>array( + 'class' => 'head1 sorting', + ), + ), + ); + + $sortableColumnNamesArray = array('estado', 'id', 'nombre'); + +$criteria = new CDbCriteria; +// bro-tip: $_REQUEST is like $_GET and $_POST combined +if (isset($_REQUEST['sSearch']) && isset($_REQUEST['sSearch']{0})) { + // use operator ILIKE if using PostgreSQL to get case insensitive search + $criteria->addSearchCondition('nombre', $_REQUEST['sSearch'], true, 'AND', 'LIKE'); +} + +$sort = new EDTSort('Candidato', $sortableColumnNamesArray); +$sort->defaultOrder = 'id'; +$pagination = new EDTPagination(); + +$dataProvider = new CActiveDataProvider('Candidato', array( + 'criteria' => $criteria, + 'pagination' => $pagination, + 'sort' => $sort, +)) ; + + $widget=$this->createWidget('ext.EDataTables.EDataTables', array( + 'id' => 'candidato-grid', + 'dataProvider' => $dataProvider, + 'cssFile' => Yii::app()->baseUrl . '/css/gridview.css', + 'ajaxUrl' => Yii::app()->createUrl('/candidato/index'), + 'filter' => Candidato::model(), + 'filterPosition'=> 'footer', + 'columns' => $columns, + )); */ + + /*if(isset($_GET['Candidato'])) + $model->attributes=$_GET['Candidato']; + + if (!Yii::app()->getRequest()->getIsAjaxRequest()) { + $this->render('index',array( + 'model'=>$model, + 'widget' => $widget, + )); + return; + } else { + echo json_encode($widget->getFormattedData(intval($_REQUEST['sEcho']))); + Yii::app()->end(); + }*/ + + $this->render('index',array( + 'model'=>$model)); + } /** * Manages all models. diff --git a/www/protected/controllers/SiteController.php b/www/protected/controllers/SiteController.php index 3777c76..1c89d6d 100644 --- a/www/protected/controllers/SiteController.php +++ b/www/protected/controllers/SiteController.php @@ -10,9 +10,9 @@ class SiteController extends Controller */ public function filters() { - return array( - 'accessControl', // perform access control for CRUD operations - ); + return array( + 'accessControl', // perform access control for CRUD operations + ); } /** diff --git a/www/protected/extensions/PageSize/PageSize.php b/www/protected/extensions/PageSize/PageSize.php new file mode 100644 index 0000000..94be87a --- /dev/null +++ b/www/protected/extensions/PageSize/PageSize.php @@ -0,0 +1,29 @@ + + * @version 1.0 + */ + +class PageSize extends CWidget +{ + public $mPageSizeOptions = array(10=>10, 25=>25, 50=>50, 75=>75, 100=>100); + public $mPageSize = 10; + public $mGridId = ''; + public $mDefPageSize = 10; + + public function run() + { + Yii::app()->user->setState('pageSize', $this->mPageSize); + + $this->mPageSize = null == $this->mPageSize ? $this->mDefPageSize : $this->mPageSize; + + echo Yii::t('pagesize', 'Mostrar '); + echo CHtml::dropDownList('pageSize', $this->mPageSize, $this->mPageSizeOptions,array( + 'onchange'=>"$.fn.yiiGridView.update('$this->mGridId',{ data:{pageSize: $(this).val() }})", + )); + echo Yii::t('pagesize', ' registros'); + } +} +?> \ No newline at end of file diff --git a/www/protected/messages/config.php b/www/protected/messages/config.php new file mode 100644 index 0000000..7686b88 --- /dev/null +++ b/www/protected/messages/config.php @@ -0,0 +1,28 @@ +dirname(__FILE__).DIRECTORY_SEPARATOR.'..', + 'messagePath'=>dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'messages', + 'languages'=>array('es'), + 'fileTypes'=>array('php'), + 'translator' => 'Yii::t', + 'overwrite'=>true, + 'exclude'=>array( + '.git', + '.svn', + 'yiilite.php', + 'yiit.php', + '/index.php', + '/assets', + '/extensions', + '/gii', + '/messages', + '/migrations', + '/runtime', + '/tests', + '/vendors', + ), +); diff --git a/www/protected/messages/es/intranet.php b/www/protected/messages/es/intranet.php new file mode 100644 index 0000000..35b2a4a --- /dev/null +++ b/www/protected/messages/es/intranet.php @@ -0,0 +1,38 @@ + '', + 'Gestión de candidatos' => '', + 'Gestión de usuarios' => '', + 'Idiomas' => '', + 'Modificar usuario' => '', + 'Modificar usuario ' => '', + 'No hay candidatos' => '', + 'Nuevo usuario' => '', + 'Ofertas' => '', + 'Preferencias' => '', + 'Sistema' => '', + 'Solicitudes de oferta' => '', + 'Tablero' => '', + 'Titulaciones' => '', + 'Usuarios' => '', + 'Ver usuarios' => '', +); diff --git a/www/protected/messages/es/zii.php b/www/protected/messages/es/zii.php new file mode 100644 index 0000000..1c3228d --- /dev/null +++ b/www/protected/messages/es/zii.php @@ -0,0 +1,23 @@ + '', +); diff --git a/www/protected/migrations/m120127_152205_tbl_candidatos.php b/www/protected/migrations/m120127_152205_tbl_candidatos.php index d200291..ae343b7 100644 --- a/www/protected/migrations/m120127_152205_tbl_candidatos.php +++ b/www/protected/migrations/m120127_152205_tbl_candidatos.php @@ -6,6 +6,7 @@ class m120127_152205_tbl_candidatos extends CDbMigration { $this->createTable('tbl_candidatos', array( 'id' => 'pk', + 'estado' => 'string', 'dni' => 'string', 'nombre' => 'string', 'apellidos' => 'string', diff --git a/www/protected/models/Candidato.php b/www/protected/models/Candidato.php index bdcaa39..3908364 100644 --- a/www/protected/models/Candidato.php +++ b/www/protected/models/Candidato.php @@ -5,6 +5,7 @@ * * The followings are the available columns in table 'tbl_candidatos': * @property integer $id + * @property string $estado * @property string $dni * @property string $nombre * @property string $apellidos @@ -14,6 +15,10 @@ * @property string $sexo * @property string $fecha_nacimiento * @property string $lugar_nacimiento + * @property datetime $fecha_alta + * @property datetime $fecha_modificacion + * @property integer $usuario_alta + * @property integer $usuario_modificacion * * The followings are the available model relations: * @property CapacidadProfesional[] $capacidades @@ -26,6 +31,12 @@ class Candidato extends CActiveRecord public $foto; + + public function getNombreApellidos() { + return $this->nombre . ' ' . $this->apellidos; + } + + /** * Devuelve la lista de géneros de un candidato. * @return array lista de géneros permitidos @@ -37,6 +48,10 @@ class Candidato extends CActiveRecord ); } + public function getCssClassEstado() { + return "estado" . array_search($this->estado, $this->opcionesEstado); + } + /** * Devuelve la lista de estados permitidos para un candidato. * @return array lista de estados permitidos @@ -89,11 +104,11 @@ class Candidato extends CActiveRecord 'tooMany'=>'You can upload only 1 user photo.', 'allowEmpty'=>'true', ), - array('dni, nombre, apellidos, email, telefono_fijo, telefono_movil, sexo, lugar_nacimiento, localidad', 'length', 'max'=>255), + array('dni, estado, nombre, apellidos, email, telefono_fijo, telefono_movil, sexo, lugar_nacimiento, localidad', 'length', 'max'=>255), array('fecha_nacimiento', 'safe'), // The following rule is used by search(). // Please remove those attributes that should not be searched. - array('id, dni, nombre, apellidos, email, telefono_fijo, telefono_movil, sexo, fecha_nacimiento, lugar_nacimiento, localidad', 'safe', 'on'=>'search'), + array('id, estado, dni, nombreApellidos, nombre, apellidos, email, telefono_fijo, telefono_movil, sexo, fecha_nacimiento, lugar_nacimiento, localidad', 'safe', 'on'=>'search'), ); } @@ -116,20 +131,23 @@ class Candidato extends CActiveRecord */ public function attributeLabels() { - return array( - 'id' => 'ID', - 'foto' => 'Foto', - 'dni' => 'DNI/Pasaporte', - 'nombre' => 'Nombre', - 'apellidos' => 'Apellidos', - 'email' => 'Email', - 'telefono_fijo' => 'Telefono fijo', - 'telefono_movil' => 'Telefono móvil', - 'sexo' => 'Sexo', - 'fecha_nacimiento' => 'Fecha de nacimiento', - 'lugar_nacimiento' => 'Lugar de nacimiento', - 'localidad' => 'Localidad', - ); + return array( + 'id' => 'ID', + 'estado' => 'Estado', + 'nombreApellidos' => 'Candidato', + 'foto' => 'Foto', + 'dni' => 'DNI/Pasaporte', + 'nombre' => 'Nombre', + 'apellidos' => 'Apellidos', + 'email' => 'Email', + 'telefono_fijo' => 'Telefono fijo', + 'telefono_movil' => 'Telefono móvil', + 'sexo' => 'Sexo', + 'fecha_nacimiento' => 'Fecha de nacimiento', + 'lugar_nacimiento' => 'Lugar de nacimiento', + 'localidad' => 'Localidad', + 'fecha_modificacion' => 'Último cambio', + ); } /** @@ -144,7 +162,8 @@ class Candidato extends CActiveRecord $criteria=new CDbCriteria; $criteria->compare('id',$this->id); - $criteria->compare('dni',$this->dni,true); + $criteria->compare('estado',$this->estado,true); + $criteria->compare('dni',$this->dni,true); $criteria->compare('nombre',$this->nombre,true); $criteria->compare('apellidos',$this->apellidos,true); $criteria->compare('email',$this->email,true); @@ -154,6 +173,8 @@ class Candidato extends CActiveRecord $criteria->compare('fecha_nacimiento',$this->fecha_nacimiento,true); $criteria->compare('lugar_nacimiento',$this->lugar_nacimiento,true); + //$criteria->compare('nombreApellidos',$this->nombreApellidos,true); + return new CActiveDataProvider($this, array( 'criteria'=>$criteria, )); @@ -161,6 +182,7 @@ class Candidato extends CActiveRecord protected function beforeValidate() { if ($this->isNewRecord) { + $this->estado = 'Pendiente de clasificar'; $this->fecha_alta = date('Y-m-d H:i:s', time()); $this->fecha_modificacion = $this->fecha_alta; $this->usuario_alta = Yii::app()->user->id; diff --git a/www/protected/runtime/CSS/4.4.0,4af9cb41e1f64636f725057634b6a44b,1.ser b/www/protected/runtime/CSS/4.4.0,4af9cb41e1f64636f725057634b6a44b,1.ser new file mode 100644 index 0000000000000000000000000000000000000000..f2dcb33f8c4019f81bec14047b7d7651edbd3e11 GIT binary patch literal 25462 zcmeG_Wpm?7w)<0F&Bs@jsyLaMWPCr_0$aAol1%w>ODtK;lDD?%F*7qW^FC%~W@cvQ z(*h@R@62r0_9od|`z6zEwYrbG51-R#xc=GG{-d$P(0mr#hONi1W1@)bhV9#_9r%y> zkNa;=;LoG93iU^?CH?dMBN%~N&}sWd@aQ$U|Fj;}JB49-nV!h5ZTgR140{1BYpIm-9H6zVXD|Rt@?Kle#3XGx}WMX8gK?37yU<@EJ!`W8*|(DdH|sk z#F`$Tq(OL+q?HS6-`}Rf@xHx2bwBU{kY-l_M$6VT9gf@Xx7(@(X^OtT*;W{#$%)l; zoHqxN1aMwxz~km1v>;Q^$JzZSO@|o=0orN1|Fn4{wl%Z2N{8j9b z$=uWqfeIS#1!R-hzKN)!J$QK8lgo~3Zp%gXMHhHab#)oI62vKqCw7(*1LA0M2j&8Ti!w?cwAB}D9uSL{b2XyEM zu_wC-rH~#09d-)(hKf263Iewe6xWWjT0WiKzxV;pRc~M}$2O=}_lbRH2>af&g-B6M zU`yQ-RSrR6L;HB|Xa@|{wUZX@PQm~wd!PW{Bk6XV2fB`})yReL51|_mM*1u8-%g}m-aq2QX52VG*aM_!AAW%6 z@RcvM{jdOxKcFzsb~*tCCSPs40oEf%yFc6Ry-DI7hqoXu1yF$+{nF2x3skGV0XG4| zF_hy38JO@IFy-f7gQ0x$v|j_l-OQKW%$MEFm)*>l-OQKW z%$MEFm)*>l-OSIrnV)rIo^@lMbz^#`-JsrSw|?)m1E6=>LC`zxKh;~m#jrhAI6C4!y=8DKN=dmugOb`}fFa=U>CSi+!wTywnlIIp8Y zs}O7FO~dPeo`F(3*ICW}dM}cpVD`bGfDn0^WMM_|AUIXFB$ucga-d^>^B*KWTw zmi@#4W%(FedXVc6DVU&I)_VH37V>B#VIykMjof*iCV=)9N%^j?wIMt4{2**dHE_W< zdJK^a+wzQ(x+()k`o8NgUYRvmEjWxjTDB%Pzd_yhO?Q05J&Vm;LF*LJV{ zAFx#&B#i-D`>{nPOjg)e@s3D73IeE%4sUAmIuntF;IJ7 zcG1~bi5ds)&c;WM8@p^=)(^nKg0sA_amO@GUm2ho?kJS+tl`Et3Gjdfb9LWDo;I$3 z4k!CkzCt&{c3w?*6T&8sUSk1C0k_dlf>uQuHD%I{$7q224S7(f7G;&op)<$c0JxBb}LjsuAH4>Rpf`s8@R=3ebT zWO>*62$*0si$T2eT0=b~qSx4g=f{<$ccJ#aF#vR=qmKLMVB8!icAGe79WHw)U;*Jh zADDV5fFb4SIxhTBpaOch7E;F$>91ty*RrYQ$j@6hbp%(fddTuW^j0B(r8Ao%ML=8=#DME$-Y%!WtYZ49&b zMvhn5TBEVNQt!D%V#>WaH#=`>Y9SqJ7m@OG&4!E^=s?&BssKD!9rXKH@u*hn?W5^& zwF~1p-K3{Pyl;gq&*aQLFaS)u8P5l1aD*hk1DNC9X7F9GF(7~f*x36{|CK48Z_(2SVbSE_K!WRi(mm)1 zhXsV|lmJi#%kreoI_dN#5Yjh#TE%HM0y$BESzK#Yt>ks(xXDCCN`5`Xt_NiTH0$iT zP!<5pQvU`YzTHRhe|W22rpY}%Rti9ihHptX7}8_!+Ru0w3>NfV*Y@=jOK(!s?=S5F zVhx8;S)IjjU()q9&RIm@w{xZ*fNc-V)&|D??_ zzCQxpiNRM!DLTWt3mt;Vd|0&QtuIyf4IOrQW^$IoC8*=Y7w!VDLGHA8-6Yc=iq>)e z2_zaF5Cf0elpEYaK*KWTc0|1j43+=~$ff zAb`O9ZsECKR$70=9kWt6i#k`+_TkR%Q8KR%4u$Q-NcVP|zLoXaJJ1|K3pt*z;tVM9 zxv*fDk17^+s#m;%G%npt=Ouq**a8c zGHuJY?Tzi&E|ebf?Z6K0$c}AvT|KjNyRb{UvbP&~qiocTw$V4n#@tvNd$ZX%8+YSv z{7tY4H_;~EB%5@TZSqaADL2(->&TAcsE+37j^UV&<=D=~aU9q29N!6?(21PbNu1Ql zoZKm#(y5%SE4zxTx|*xIhHJW(Yr7lQab4GQeK&AJH*#Y)aZ@*QbGL9yw{o|h>?xk= zX`b#Gp6OYh?QJ~Ab3M=VJ-8U`MPBSBUg~9D?iF6?Ro>Q@eZ^OO&DVXyH+{>u{f+PV zuJ8FiWZ{Q?LK}R6;e>LOnD>GqgfG+=Nc(hF<80K^TTn7>7xihFO@0MOcPaxQ*mU ziPT7o^vH>+UX{BQaANdKMm3_jnX(x(lpJ|JT1~PtkMkr?^DNKvA}{kQ-xhMA6l$RrdSMi1VHI|SLrF-Bn%Y>LqsgRvNg@z@L#FcFimIkv!-*a}-?SNH%Q;uwzO1Ww{3e2i201fSwG z&fqN0;XFRW1zf}>e2y>hCBDMf_!TiAh6G071VNC*h!_(TF(IY|O)vyYa0E}x2!Rj@ ziI@`$Vo9usHE~4_$RUZ5I7yHsIU>g-MNY^mNs|o8k{rpCGg2T$QX=Q%f?Sd-a!p>1 z2BYB!8{s2jM2<$I@rW8tM$-{JVn*zU8}XyrNEnGDX*3@#M$6G^v>siJ2jk%w8{=bQ zOpZt6@t7J<#?vu9X2$H88}sAYSQv|AX*?e<#>??)ydGas18PWN6iyKoNsXv6MNt!K zO3@TUu@pz~)Ql1+k&>u6wV;;Nids`wlfh&-!6x{Gn2?jvWIUlJlgV^KPnZci;U@fK zHW4P`M4HSei^+1bnye>R)4_B&#isa_n3B`cbUdY|lj(FyPnjt@<)-{}HWjAgRGQAG zi|KN@ny#l;^nf1H7>&~eP0}NJOjGoPp3*eU&@9c-JUycYTBId|88Z|!VWtetFbvCZ4A0CMfe{&rnKKJ!$*h<)bHxtWA&ap%ORyw6V#h4S zPS`0+vkc3!9LuvaR$xU|V(09FU9u~7&0cW>ZpdLA&Ji5RjkqyKaT9LJ(Hz6E9LMq8 zj1xGKlejsz;FjEqTXR?ZfFJT0kMjgi@*{rCQ~ZRV@-)xzEYI;gKjQ^ntc102B@V=)h>5sJh@?0Y$08+8 z#HmP&jL3?d$cr;k5JgcE=i)+KiYsv~UP%LKC}9#V5fUklq_IRv6KN{Z5+kt^C-Kru z5+qTQq`9<^meNXEOIP#3d^pGE_?(!N^U-`fr{x$X%h7VYq?VKAbV)CnCA;L7{BpJwmf})c&X(P3=rq+}7 zbWN|BHM{24{Cc()*5X=P&)19fa=luw*H@>#v-8JKo?cu&`+yJppb!3#5B;zY|A>$L zsE_`bkNvoh|AbHcq)+~oPyMt{|BTQ4tk3?O&;7j5|AH_4qA&iEFa5GF|BA2ts;~Z< zul>5O|Aue;rf>e1Z~eA+e*1TP=XZVg_k8d7eg6;q;1B)qkNoJ5{rFG(@BHrX{r(^P;UE3+pZw{c{rO+~F^Z zxpjp_WK6?zC2;F{BFGZ16VRYUr_~m}Jcr;ls$+r5F~ak@^#oeyb?YhWuUi+;dQ!J8 zq4l(GJ%iRo-GU+&cK@{Z4lvcq0@842pJG)}h~ zY1(RnaUV*MKsVTCb@#4VSKNmxBk8hAF}J$|nCn8Vy`v;@?<=fo?;GStU&GSeUxThhhkM#Glmi37@c;@g0Ox}8 zF~~)E(iGY|+=X}0rU91Mr{|9;db{yT>b(zHjJr7s1*WJui`N0|cxMRPoHogn20`m1NHQqb zfqo;gdX3LWMS<6w`cWv&4k@9{#S17a{#;G)j=^7-R;=H;?yj|(_tM*3O@!(pWMZ|I zvTjw{{&tquT_{RGRjs5u=1oPw)0b+SFR#}P@tRkusYg%IuIZ^Q4UVYmcBgWH5(r;c wSWvvPz883}D#i7slOmRD?s2RtFZ*s!6RU;jQU>7c3LgfbOtk+|1YBJIfAZaY%m4rY literal 0 HcmV?d00001 diff --git a/www/protected/runtime/URI/4.4.0,fdfc1465c1553db684e2f90f64511cd4,1.ser b/www/protected/runtime/URI/4.4.0,fdfc1465c1553db684e2f90f64511cd4,1.ser new file mode 100644 index 0000000000000000000000000000000000000000..f6d3e812b706751db73261e535cbc8e9e3632a7d GIT binary patch literal 516 zcmZvYK~BRk5Jh{IS+Yt}Krr4Rgjxw&L}48{?YOb(CXww3N|n1ab|OkkcJ}Cd-t%8# zc8f53e|dgwtyY?B{_!?{B&93ubzK48;nCqWfHw6XBF52$QRc(#Df@AS7lX zn{r}SJO5zhdS|rrAeJ~Cp*+Qh`FWO6J+G4c$QxP5j4Yyy6GCEw$1a*S3aRa z#S<7y6` literal 0 HcmV?d00001 diff --git a/www/protected/runtime/gii-1.1.10-dev/FormCode.php b/www/protected/runtime/gii-1.1.10-dev/FormCode.php new file mode 100644 index 0000000..c52eb26 --- /dev/null +++ b/www/protected/runtime/gii-1.1.10-dev/FormCode.php @@ -0,0 +1,5 @@ + 'default', + 'viewPath' => 'application.views', +); diff --git a/www/protected/views/candidato/_form.php b/www/protected/views/candidato/_form.php index bc1962a..c07b913 100644 --- a/www/protected/views/candidato/_form.php +++ b/www/protected/views/candidato/_form.php @@ -1,102 +1,181 @@ -
+clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/elements.js'); +?> beginWidget('CActiveForm', array( 'id'=>'candidato-form', 'enableAjaxValidation'=>false, + 'htmlOptions'=>array('enctype' => 'multipart/form-data'), )); ?> -

Fields with * are required.

+
+
+ +

Los campos marcados con * son obligatorios.

+
- errorSummary($model); ?> + errorSummary($model, "", "", array('class'=>"notification msgerror")); ?> +
+
+
+

+ + Datos personales + +

+
+
+ labelEx($model,'foto', array('class'=>'nopadding')); ?> +
+ foto, $model->nombre, + array("title" => $model->nombre, "width"=>"120", "height"=>"120") + ); ?> + + error($model,'foto', array('class'=>'error')); ?> +
+
-
- labelEx($model,'foto'); ?> - textField($model,'foto',array('size'=>60,'maxlength'=>255)); ?> - error($model,'foto'); ?> -
+
+ labelEx($model,'nombre'); ?> +
+ textField($model,'nombre',array('maxlength'=>255,'class'=>'mf')); ?> + error($model,'nombre', array('class'=>'error')); ?> +
+
+ +
+ labelEx($model,'apellidos'); ?> +
+ textField($model,'apellidos',array('maxlength'=>255,'class'=>'lf')); ?> + error($model,'apellidos', array('class'=>'error')); ?> +
+
-
- labelEx($model,'dni'); ?> - textField($model,'dni',array('size'=>60,'maxlength'=>255)); ?> - error($model,'dni'); ?> -
+
+ labelEx($model,'sexo', array('class'=>'nopadding')); ?> +
+ sexo, + $model->OpcionesGenero, + array('separator'=>'    ')); + echo strip_tags($cadena, ''); + ?> + error($model,'sexo', array('class'=>'error')); ?> +
+
+ +
+ labelEx($model,'dni'); ?> +
+ textField($model,'dni',array('maxlength'=>255,'class'=>'sf')); ?> + error($model,'dni', array('class'=>'error')); ?> +
+
+ +
+ labelEx($model,'fecha_nacimiento'); ?> +
+ textField($model,'fecha_nacimiento',array('class'=>'sf','id'=>'datepicker')); ?> + error($model,'fecha_nacimiento', array('class'=>'error')); ?> +
+
-
- labelEx($model,'nombre'); ?> - textField($model,'nombre',array('size'=>60,'maxlength'=>255)); ?> - error($model,'nombre'); ?> -
- -
- labelEx($model,'apellidos'); ?> - textField($model,'apellidos',array('size'=>60,'maxlength'=>255)); ?> - error($model,'apellidos'); ?> -
- -
- labelEx($model,'email'); ?> - textField($model,'email',array('size'=>60,'maxlength'=>255)); ?> - error($model,'email'); ?> -
- -
- labelEx($model,'telefono_fijo'); ?> - textField($model,'telefono_fijo',array('size'=>60,'maxlength'=>255)); ?> - error($model,'telefono_fijo'); ?> -
- -
- labelEx($model,'telefono_movil'); ?> - textField($model,'telefono_movil',array('size'=>60,'maxlength'=>255)); ?> - error($model,'telefono_movil'); ?> -
- -
- labelEx($model,'sexo'); ?> - textField($model,'sexo',array('size'=>60,'maxlength'=>255)); ?> - error($model,'sexo'); ?> -
- -
- labelEx($model,'fecha_nacimiento'); ?> - textField($model,'fecha_nacimiento'); ?> - error($model,'fecha_nacimiento'); ?> -
- -
- labelEx($model,'lugar_nacimiento'); ?> - textField($model,'lugar_nacimiento',array('size'=>60,'maxlength'=>255)); ?> - error($model,'lugar_nacimiento'); ?> -
- -
- labelEx($model,'fecha_alta'); ?> - textField($model,'fecha_alta'); ?> - error($model,'fecha_alta'); ?> -
- -
- labelEx($model,'usuario_alta'); ?> - textField($model,'usuario_alta'); ?> - error($model,'usuario_alta'); ?> -
- -
- labelEx($model,'fecha_modificacion'); ?> - textField($model,'fecha_modificacion'); ?> - error($model,'fecha_modificacion'); ?> -
- -
- labelEx($model,'usuario_modificacion'); ?> - textField($model,'usuario_modificacion'); ?> - error($model,'usuario_modificacion'); ?> -
- -
- isNewRecord ? 'Create' : 'Save'); ?> -
+
+ labelEx($model,'lugar_nacimiento'); ?> +
+ textField($model,'lugar_nacimiento',array('maxlength'=>255,'class'=>'lf')); ?> + error($model,'lugar_nacimiento', array('class'=>'error')); ?> +
+
+
+
+
+
+
+

+ + Datos de contacto + +

+
+
+ labelEx($model,'telefono_fijo'); ?> +
+ textField($model,'telefono_fijo',array('maxlength'=>255,'class'=>'sf')); ?> + error($model,'telefono_fijo', array('class'=>'error')); ?> +
+
+
+ labelEx($model,'telefono_movil'); ?> +
+ textField($model,'telefono_movil',array('maxlength'=>255,'class'=>'sf')); ?> + error($model,'telefono_movil', array('class'=>'error')); ?> +
+
+
+ labelEx($model,'email'); ?> +
+ textField($model,'email',array('maxlength'=>255,'class'=>'mf')); ?> + error($model,'email', array('class'=>'error')); ?> +
+ +
+
+ labelEx($model,'localidad'); ?> +
+ findAll(),'id', 'poblacion', 'provincia_id'); + $provincias = Provincia::model()->findAll(); + + foreach ($provincias as $provincia) { + if (array_key_exists($provincia->id, $lista)) { + $lista[$provincia->provincia] = $lista[$provincia->id]; + unset($lista[$provincia->id]); + } + } + echo CHtml::dropDownList( + 'localidad', + $model->localidad, + $lista, + array( + 'empty'=>'', + 'class'=>'mf', + )); + ?> + error($model,'localidad', array('class'=>'error')); ?> +
+
+ +
+
+
+
+
+

+ + Datos académicos + +

+ + renderPartial('_idiomas', array( + 'model'=>$model, + 'idioma'=>$idioma, + 'idiomasValidos'=>$idiomasValidos, + )); ?> + + renderPartial('_titulaciones', array( + 'model'=>$model, + 'titulacion'=>$titulacion, + 'titulacionesValidas'=>$titulacionesValidas, + )); ?> + +
+
+
+ +
endWidget(); ?> -
\ No newline at end of file diff --git a/www/protected/views/candidato/_formCandidatoIdioma.php b/www/protected/views/candidato/_formCandidatoIdioma.php deleted file mode 100644 index 510eeb9..0000000 --- a/www/protected/views/candidato/_formCandidatoIdioma.php +++ /dev/null @@ -1,30 +0,0 @@ - - - textField($model,"[$id]idioma"); ?> - error($model,"idioma"); ?> - - - - - textField($model,"[$id]conversacion"); ?> - error($model,"conversacion"); ?> - - - - textField($model,"[$id]lectura_traduccion"); ?> - error($model,"lectura_traduccion"); ?> - - - - '', - 'params'=>array( - 'CandidatoIdioma[command]'=>'delete', - 'CandidatoIdioma[id]'=>$id, - 'noValidate'=>true) - ));?> - - \ No newline at end of file diff --git a/www/themes/intranet/views/candidato/_idiomas.php b/www/protected/views/candidato/_idiomas.php similarity index 100% rename from www/themes/intranet/views/candidato/_idiomas.php rename to www/protected/views/candidato/_idiomas.php diff --git a/www/themes/intranet/views/candidato/_titulaciones.php b/www/protected/views/candidato/_titulaciones.php similarity index 100% rename from www/themes/intranet/views/candidato/_titulaciones.php rename to www/protected/views/candidato/_titulaciones.php diff --git a/www/protected/views/candidato/create.php b/www/protected/views/candidato/create.php index a98a27f..d4a01dc 100644 --- a/www/protected/views/candidato/create.php +++ b/www/protected/views/candidato/create.php @@ -1,15 +1,23 @@ breadcrumbs=array( 'Candidatos'=>array('index'), - 'Create', + 'Nuevo candidato', ); - $this->menu=array( - array('label'=>'List Candidato', 'url'=>array('index')), - array('label'=>'Manage Candidato', 'url'=>array('admin')), + array( + 'label'=>'Lista de candidatosLista de candidatos', + 'url'=>array('index'), + 'linkOptions'=>array('class'=>'iconlink'), + ), ); +$this->pageTitle='Nuevo candidato'; ?> -

Create Candidato

- -renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file +renderPartial('_form', array( + 'model'=>$model, + 'idioma'=>$idioma, + 'titulacion'=>$titulacion, + 'idiomasValidos'=>$idiomasValidos, + 'titulacionesValidas'=>$titulacionesValidas, + )); +?> \ No newline at end of file diff --git a/www/protected/views/candidato/index.php b/www/protected/views/candidato/index.php index cbcef13..f5a0b72 100644 --- a/www/protected/views/candidato/index.php +++ b/www/protected/views/candidato/index.php @@ -1,17 +1,142 @@ breadcrumbs=array( - 'Candidatos', + Yii::t('intranet', 'Candidatos'), ); $this->menu=array( - array('label'=>'Create Candidato', 'url'=>array('create')), - array('label'=>'Manage Candidato', 'url'=>array('admin')), + array( + 'label'=>'Nuevo candidatoNuevo candidato', + 'url'=>array('create'), + 'linkOptions'=>array('class'=>'iconlink'), + ), ); + +Yii::app()->clientScript->registerScript('search', " +$('.search-button').click(function(){ + $('.search-form').toggle(); + return false; +}); +$('.search-form form').submit(function(){ + $.fn.yiiGridView.update('candidato-grid', { + data: $(this).serialize() + }); + return false; +}); +"); + +$this->pageTitle=Yii::t('intranet', 'Gestión de candidatos'); ?> -

Candidatos

+

+You may optionally enter a comparison operator (<, <=, >, >=, <> +or =) at the beginning of each of your search values to specify how the comparison should be done. +

-widget('zii.widgets.CListView', array( - 'dataProvider'=>$dataProvider, - 'itemView'=>'_view', +'search-button')); ?> + + +widget('ext.EDataTables.EDataTables', array( + 'id' => 'candidatos', + 'options' => array( + 'class' => 'dataTables_wrapper', + ), + 'dataProvider' => $model->search(), + //'ajaxUrl' => Yii::app()->getBaseUrl().'/candidato/index', + 'columns'=>array( + 'id', + 'foto', + 'dni', + 'nombre', + 'apellidos', + 'email', + )));*/ + + + //$widget->run(); + + $columns = array( + array( + 'type' => 'html', + 'name' => 'nombreApellidos', + 'value' => 'CHtml::link(CHtml::encode($data->nombreApellidos), array("update", "id"=>$data->id));', + 'headerHtmlOptions'=>array( + 'class' => 'head0 sorting', + /*'colspan' => '1', + 'rowspan' => '2',*/ + ), + ), + array( + 'type' => 'html', + 'name' => 'estado', + 'value' => 'CHtml::link(CHtml::encode($data->estado), "#", array("class" => $data->cssClassEstado));', + 'headerHtmlOptions'=>array( + 'class' => 'head1 sorting', + /*'colspan' => '1', + 'rowspan' => '2',*/ + ), + ), + + array( + 'name' => 'id', + 'headerHtmlOptions'=>array( + 'class' => 'head0 sorting', + /*'colspan' => '1', + 'rowspan' => '1',*/ + ), + ), + array( + 'name' => 'fecha_modificacion', + 'headerHtmlOptions'=>array( + 'class' => 'head1 sorting', + /*'colspan' => '1', + 'rowspan' => '2',*/ + ), + ), + array( + 'class'=>'CButtonColumn', + //'template'=>'{update}{delete}', + //'updateButtonUrl'=>'Yii::app()->createUrl("/candidato/update", array("id" => $data["id"]))', + //'deleteButtonUrl'=>'Yii::app()->createUrl("/candidato/delete", array("id" => $data["id"]))', + ), + ); + + + $this->widget('zii.widgets.grid.CGridView', array( + 'id'=>'candidato-grid', + 'dataProvider'=>$model->search(), + 'filter'=>$model, + 'cssFile' => Yii::app()->baseUrl . '/css/gridview2.css', + 'itemsCssClass' => 'display', + 'summaryCssClass' => 'dataTables_length', + 'pagerCssClass' => 'ui-toolbar dataTables_paginate', + 'htmlOptions' => array( + 'class' => 'dataTables_wrapper', + ), + 'filterPosition' => 'footer', + 'emptyText' => Yii::t('intranet', 'No hay candidatos'), + 'summaryText' => 'Mostrando registros del {start} al {end} de {count} en total.', + 'columns'=>$columns, + )); + + echo "



"; + + $this->widget('ext.EDataTables.EDataTables', array( + 'id' => 'candidato-grid2', + 'dataProvider' => $model->search(), + 'cssFile' => Yii::app()->baseUrl . '/css/gridview.css', + 'ajaxUrl' => Yii::app()->createUrl('/candidato/index'), + 'columns' => $columns, + 'filter' => Candidato::model(), + 'filterPosition'=> 'footer', + + //'hasFooter' => true, + )); + +?> + + + \ No newline at end of file diff --git a/www/protected/views/candidato/update.php b/www/protected/views/candidato/update.php index 3605992..df5f099 100644 --- a/www/protected/views/candidato/update.php +++ b/www/protected/views/candidato/update.php @@ -11,8 +11,17 @@ $this->menu=array( array('label'=>'View Candidato', 'url'=>array('view', 'id'=>$model->id)), array('label'=>'Manage Candidato', 'url'=>array('admin')), ); + +$this->pageTitle='Modificar candidato ' . $model->nombre . ' ' . $model->apellidos; ?>

Update Candidato id; ?>

-renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file +renderPartial('_form', array( + 'model'=>$model, + 'idioma'=>$idioma, + 'titulacion'=>$titulacion, + 'idiomasValidos'=>$idiomasValidos, + 'titulacionesValidas'=>$titulacionesValidas, + )); +?> \ No newline at end of file diff --git a/www/protected/views/layouts/column1.php b/www/protected/views/layouts/column1.php deleted file mode 100644 index f70b154..0000000 --- a/www/protected/views/layouts/column1.php +++ /dev/null @@ -1,5 +0,0 @@ -beginContent('//layouts/main'); ?> -
- -
-endContent(); ?> \ No newline at end of file diff --git a/www/protected/views/layouts/column2.php b/www/protected/views/layouts/column2.php deleted file mode 100644 index e435a69..0000000 --- a/www/protected/views/layouts/column2.php +++ /dev/null @@ -1,21 +0,0 @@ -beginContent('//layouts/main'); ?> -
-
- -
-
-
- -
-endContent(); ?> \ No newline at end of file diff --git a/www/themes/intranet/views/layouts/default.php b/www/protected/views/layouts/default.php similarity index 72% rename from www/themes/intranet/views/layouts/default.php rename to www/protected/views/layouts/default.php index bfc1fbe..960f143 100644 --- a/www/themes/intranet/views/layouts/default.php +++ b/www/protected/views/layouts/default.php @@ -1,24 +1,24 @@ - - + + - + - + - - - + + + <?php echo CHtml::encode($this->pageTitle); ?> @@ -55,39 +55,42 @@ - Logo + Logo -
- +
widget('zii.widgets.CMenu',array( 'activeCssClass'=>'current', - 'activateParents'=>true, 'linkLabelWrapper' => 'span', 'items'=>array( array( - 'label'=>'Tablero', + 'label'=>Yii::t('intranet', 'Tablero'), 'url'=>array('/site/index'), 'linkOptions'=>array('class'=>'dashboard'), + 'active' => ($this->getId() == 'tablero'), ), array( - 'label'=>'Candidatos', - 'url'=>array('/candidato', 'view'=>'index'), + 'label'=>Yii::t('intranet', 'Candidatos'), + 'url'=>array('/candidato'), 'linkOptions'=>array('class'=>'candidatos'), + 'active' => ($this->getId() == 'candidato'), ), array( - 'label'=>'Ofertas', + 'label'=>Yii::t('intranet', 'Ofertas'), 'url'=>array(''), 'linkOptions'=>array('class'=>'ofertas'), + 'active' => ($this->getId() == 'oferta'), ), array( - 'label'=>'Solicitudes de oferta', + 'label'=>Yii::t('intranet', 'Solicitudes de oferta'), 'url'=>array(''), - 'linkOptions'=>array('class'=>'solicitudes'), + 'linkOptions'=>array('class'=>'solicitudes'), + 'active' => ($this->getId() == 'solicitud'), ), array( - 'label'=>'Sistema', - 'url'=>array('/usuario', 'view'=>'index'), + 'label'=>Yii::t('intranet', 'Sistema'), + 'url'=>array('/usuario'), 'linkOptions'=>array('class'=>'sistema'), + 'active' => ($this->getId() == 'usuario') ), ), )); ?> @@ -101,7 +104,7 @@

user->name; ?>

- Preferencias + createAbsoluteUrl('site/logout')); ?>

@@ -113,6 +116,7 @@
breadcrumbs)):?> widget('zii.widgets.CBreadcrumbs', array( + 'homeLink'=>CHtml::link(Yii::t('intranet', 'Tablero'), array('/site/index')), 'links'=>$this->breadcrumbs, 'separator'=>'', )); ?> @@ -157,6 +161,7 @@ +
diff --git a/www/themes/intranet/views/layouts/login.php b/www/protected/views/layouts/login.php similarity index 58% rename from www/themes/intranet/views/layouts/login.php rename to www/protected/views/layouts/login.php index 4358d21..b106ce3 100644 --- a/www/themes/intranet/views/layouts/login.php +++ b/www/protected/views/layouts/login.php @@ -1,23 +1,23 @@ - - + + - + - + - - + + <?php echo CHtml::encode($this->pageTitle); ?> diff --git a/www/protected/views/layouts/main.php b/www/protected/views/layouts/main.php deleted file mode 100644 index f2ff75a..0000000 --- a/www/protected/views/layouts/main.php +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - <?php echo CHtml::encode($this->pageTitle); ?> - - - - -
- - - - - breadcrumbs)):?> - widget('zii.widgets.CBreadcrumbs', array( - 'links'=>$this->breadcrumbs, - )); ?> - - - - -
- - - -
- - - diff --git a/www/protected/views/site/contact.php b/www/protected/views/site/contact.php deleted file mode 100644 index 51f90a9..0000000 --- a/www/protected/views/site/contact.php +++ /dev/null @@ -1,81 +0,0 @@ -pageTitle=Yii::app()->name . ' - Contact Us'; -$this->breadcrumbs=array( - 'Contact', -); -?> - -

Contact Us

- -user->hasFlash('contact')): ?> - -
- user->getFlash('contact'); ?> -
- - - -

-If you have business inquiries or other questions, please fill out the following form to contact us. Thank you. -

- -
- -beginWidget('CActiveForm', array( - 'id'=>'contact-form', - 'enableClientValidation'=>true, - 'clientOptions'=>array( - 'validateOnSubmit'=>true, - ), -)); ?> - -

Fields with * are required.

- - errorSummary($model); ?> - -
- labelEx($model,'name'); ?> - textField($model,'name'); ?> - error($model,'name'); ?> -
- -
- labelEx($model,'email'); ?> - textField($model,'email'); ?> - error($model,'email'); ?> -
- -
- labelEx($model,'subject'); ?> - textField($model,'subject',array('size'=>60,'maxlength'=>128)); ?> - error($model,'subject'); ?> -
- -
- labelEx($model,'body'); ?> - textArea($model,'body',array('rows'=>6, 'cols'=>50)); ?> - error($model,'body'); ?> -
- - -
- labelEx($model,'verifyCode'); ?> -
- widget('CCaptcha'); ?> - textField($model,'verifyCode'); ?> -
-
Please enter the letters as they are shown in the image above. -
Letters are not case-sensitive.
- error($model,'verifyCode'); ?> -
- - -
- -
- -endWidget(); ?> - -
- - \ No newline at end of file diff --git a/www/protected/views/site/login.php b/www/protected/views/site/login.php index 78577f9..4eb6a2c 100644 --- a/www/protected/views/site/login.php +++ b/www/protected/views/site/login.php @@ -1,5 +1,48 @@ -

Login

+pageTitle=Yii::app()->name . ' - Login'; +$this->breadcrumbs=array( + 'Login', +); +?> + + -
- -
\ No newline at end of file +beginWidget('CActiveForm', array( + 'id'=>'login-form', + 'enableClientValidation'=>true, + 'clientOptions'=>array( + 'validateOnSubmit'=>true, + ), +)); ?> + +error($model,'username', array('class'=>'notification notifyError loginNotify')); + echo $form->error($model,'password', array('class'=>'notification notifyError loginNotify')); + echo $form->error($model,'rememberMe', array('class'=>'notification notifyError loginNotify')); +?> + +
+
+
+ labelEx($model,'username');*/ + echo $form->textField($model,'username', array('class'=>'username')); + /*echo $form->labelEx($model,'password'); */ + echo $form->passwordField($model,'password', array('class'=>'password')); + ?> + +
+
+
+ +
+ checkBox($model,'rememberMe'); + echo $form->label($model,'rememberMe'); + echo $form->error($model,'rememberMe'); + ?> + +
+endWidget(); ?> diff --git a/www/protected/views/site/pages/about.php b/www/protected/views/site/pages/about.php deleted file mode 100644 index c6c05dc..0000000 --- a/www/protected/views/site/pages/about.php +++ /dev/null @@ -1,10 +0,0 @@ -pageTitle=Yii::app()->name . ' - About'; -$this->breadcrumbs=array( - 'About', -); -?> -

About

- -

This is a "static" page. You may change the content of this page -by updating the file .

\ No newline at end of file diff --git a/www/themes/intranet/views/site/tablero.php b/www/protected/views/site/tablero.php similarity index 100% rename from www/themes/intranet/views/site/tablero.php rename to www/protected/views/site/tablero.php diff --git a/www/protected/views/usuario/_form.php b/www/protected/views/usuario/_form.php index 39f6c11..08c4922 100644 --- a/www/protected/views/usuario/_form.php +++ b/www/protected/views/usuario/_form.php @@ -1,49 +1,74 @@ -
- beginWidget('CActiveForm', array( 'id'=>'usuario-form', 'enableAjaxValidation'=>false, )); ?> -

Fields with * are required.

- errorSummary($model); ?> +
+
+ +

Los campos marcados con * son obligatorios.

+
-
- labelEx($model,'email'); ?> - textField($model,'email',array('size'=>60,'maxlength'=>255)); ?> - error($model,'email'); ?> -
+ errorSummary($model, "", "", array('class'=>"notification msgerror")); ?> +
+
-
- labelEx($model,'name'); ?> - textField($model,'name',array('size'=>60,'maxlength'=>255)); ?> - error($model,'name'); ?> -
+
+

+ + Datos del usuario + +

+
+
+ labelEx($model,'name'); ?> +
+ textField($model,'name',array('maxlength'=>255,'class'=>'mf')); ?> + error($model,'name', array('class'=>'error')); ?> +
+
+ +
+ labelEx($model,'email'); ?> +
+ textField($model,'email',array('maxlength'=>255,'class'=>'mf')); ?> + error($model,'email', array('class'=>'error')); ?> +
+
-
- labelEx($model,'username'); ?> - textField($model,'username',array('size'=>60,'maxlength'=>255)); ?> - error($model,'username'); ?> -
+
+ labelEx($model,'username'); ?> +
+ textField($model,'username',array('maxlength'=>255,'class'=>'mf')); ?> + error($model,'username', array('class'=>'error')); ?> +
+ +
+ +
+ labelEx($model,'password'); ?> +
+ passwordField($model,'password',array('maxlength'=>255, 'class'=>'sf')); ?> + error($model,'password', array('class'=>'error')); ?> +
+
+ +
+ labelEx($model,'password_repeat'); ?> +
+ passwordField($model,'password_repeat',array('maxlength'=>255, 'class'=>'sf')); ?> + error($model,'password_repeat', array('class'=>'error')); ?> +
+
+ +
+ +
+
+
-
- labelEx($model,'password'); ?> - passwordField($model,'password',array('size'=>60,'maxlength'=>255)); ?> - error($model,'password'); ?> -
- -
- labelEx($model,'password_repeat'); ?> - passwordField($model,'password_repeat',array('size'=>60,'maxlength'=>255)); ?> - error($model,'password_repeat'); ?> -
- - -
- isNewRecord ? 'Create' : 'Save'); ?> -
+
endWidget(); ?> -
\ No newline at end of file diff --git a/www/protected/views/usuario/_view.php b/www/protected/views/usuario/_view.php index 78e4f35..f2639c8 100644 --- a/www/protected/views/usuario/_view.php +++ b/www/protected/views/usuario/_view.php @@ -1,28 +1,24 @@ -
+
+
+ [Logo here] +

Usuario

+

+
+ + getAttributeLabel('name')); ?>:
+ getAttributeLabel('email')); ?>:
+ getAttributeLabel('username')); ?>:
+ getAttributeLabel('last_login_time')); ?>:
+ +
- getAttributeLabel('id')); ?>: - id), array('view', 'id'=>$data->id)); ?> -
+
+ name); ?>
+ email)); ?>
+ username); ?> + last_login_time); ?> +
+

+
+
- getAttributeLabel('email')); ?>: - email); ?> -
- - getAttributeLabel('name')); ?>: - name); ?> -
- - getAttributeLabel('username')); ?>: - username); ?> -
- - getAttributeLabel('password')); ?>: - password); ?> -
- - getAttributeLabel('last_login_time')); ?>: - last_login_time); ?> -
- - -
\ No newline at end of file diff --git a/www/protected/views/usuario/create.php b/www/protected/views/usuario/create.php index 5747b39..832baf3 100644 --- a/www/protected/views/usuario/create.php +++ b/www/protected/views/usuario/create.php @@ -1,15 +1,16 @@ breadcrumbs=array( - 'Usuarios'=>array('index'), - 'Create', + Yii::t('intranet', 'Usuarios')=>array('index'), + Yii::t('intranet', 'Nuevo usuario'), ); - $this->menu=array( - array('label'=>'List Usuario', 'url'=>array('index')), - array('label'=>'Manage Usuario', 'url'=>array('admin')), + array( + 'label'=>'Lista de usuariosLista de usuarios', + 'url'=>array('index'), + 'linkOptions'=>array('class'=>'iconlink'), + ), ); +$this->pageTitle=Yii::t('intranet', 'Nuevo usuario'); ?> -

Create Usuario

- renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file diff --git a/www/protected/views/usuario/index.php b/www/protected/views/usuario/index.php index 0a57c4b..0e39ae8 100644 --- a/www/protected/views/usuario/index.php +++ b/www/protected/views/usuario/index.php @@ -1,17 +1,131 @@ breadcrumbs=array( - 'Usuarios', +$this->breadcrumbs = array( + Yii::t('intranet', 'Usuarios'), ); -$this->menu=array( - array('label'=>'Create Usuario', 'url'=>array('create')), - array('label'=>'Manage Usuario', 'url'=>array('admin')), +$this->menu = array( + array( + 'label'=>'' . Yii::t('intranet', 'Nuevo usuario') . '' . Yii::t('intranet', 'Nuevo usuario'), + 'url'=>array('create'), + 'linkOptions'=>array('class'=>'iconlink'), + ), + array( + 'label'=>'' . Yii::t('intranet', 'Búsqueda avanzada') . '' . Yii::t('intranet', 'Búsqueda avanzada'), + 'url'=>array('#'), + 'linkOptions'=>array('class'=>'iconlink search-button'), + ), ); + +/*$cs=Yii::app()->clientScript; +$cs->registerScriptFile(Yii::app()->baseUrl . '/js/star-rating/jquery.rating.pack.js', CClientScript::POS_HEAD); +$cs->registerScriptFile(Yii::app()->baseUrl . '/js/star-rating/jquery.MetaData.js', CClientScript::POS_HEAD); +$cs->registerCssFile(Yii::app()->baseUrl . '/js/star-rating/jquery.rating.css'); */ + +$this->pageTitle = Yii::t('intranet', 'Gestión de usuarios'); + +Yii::app()->clientScript->registerScript('search', " +$('.search-button').click(function(){ + $('.search-form').toggle(); + return false; +}); +$('.search-form form').submit(function(){ + $.fn.yiiGridView.update('usuario-grid', { + data: $(this).serialize() + }); + return false; +}); +"); + ?> + +

+You may optionally enter a comparison operator (<, <=, >, >=, <> +or =) at the beginning of each of your search values to specify how the comparison should be done. +

-

Usuarios

- -widget('zii.widgets.CListView', array( - 'dataProvider'=>$dataProvider, - 'itemView'=>'_view', + + + +
+
+
+ widget('application.extensions.PageSize.PageSize', array( + 'mGridId' => 'usuario-grid', + 'mPageSize' => @$_GET['pageSize'], + 'mDefPageSize' => Yii::app()->params['defaultPageSize'], + 'mPageSizeOptions' => Yii::app()->params['pageSizeOptions'], + )); + ?> +
+ +
+ +
+
+ 'html', + 'name' => 'name', + 'value' => 'CHtml::link(CHtml::encode($data->name), array("update", "id"=>$data->id));', + 'headerHtmlOptions'=>array( + 'class' => 'head0', + ), + 'cssClassExpression' => '"con0"', + ), + array( + 'type' => 'html', + 'name' => 'email', + 'value' => 'CHtml::link(CHtml::encode($data->email), array("update", "id"=>$data->id));', + 'headerHtmlOptions'=>array( + 'class' => 'head1', + ), + 'cssClassExpression' => '"con1"', + ), + array( + 'name' => 'username', + 'headerHtmlOptions'=>array( + 'class' => 'head0', + ), + 'cssClassExpression' => '"con0"', + ), + array( + 'type' => 'raw', + 'name' => 'last_login_time', + 'value' => '($data->last_login_time === NULL) ? CHtml::tag("span", array("class"=>"nodata"), "Nunca") : $data->last_login_time;', + 'headerHtmlOptions'=>array( + 'class' => 'head1', + ), + 'cssClassExpression' => '"con1"', + ), + array( + 'class'=>'CButtonColumn', + 'cssClassExpression' => '"con0"', + ) + + ); + + $this->widget('zii.widgets.grid.CGridView', array( + 'id'=>'usuario-grid', + 'dataProvider'=>$model->search(), + 'filter'=>$model, + 'cssFile' => Yii::app()->baseUrl . '/css/gridview2.css', + 'itemsCssClass' => 'display', + 'summaryCssClass' => 'dataTables_info', + 'pagerCssClass' => 'dataTables_paginate', + 'htmlOptions' => array( + 'class' => '', + ), + 'template' => '{items}{summary}{pager}', + 'filterPosition' => 'footer', + 'emptyText' => Yii::t('intranet', 'No hay candidatos'), + 'summaryText' => 'Mostrando registros del {start} al {end} de {count} en total.', + 'columns'=>$columns, + )); + ?> +
diff --git a/www/protected/views/usuario/update.php b/www/protected/views/usuario/update.php index 72c5560..42d4c48 100644 --- a/www/protected/views/usuario/update.php +++ b/www/protected/views/usuario/update.php @@ -1,18 +1,26 @@ breadcrumbs=array( - 'Usuarios'=>array('index'), - $model->name=>array('view','id'=>$model->id), - 'Update', + Yii::t('intranet', 'Usuarios')=>array('index'), + Yii::t('intranet', 'Modificar usuario'), ); - $this->menu=array( - array('label'=>'List Usuario', 'url'=>array('index')), - array('label'=>'Create Usuario', 'url'=>array('create')), - array('label'=>'View Usuario', 'url'=>array('view', 'id'=>$model->id)), - array('label'=>'Manage Usuario', 'url'=>array('admin')), + array( + 'label'=>'Lista de usuariosLista de usuarios', + 'url'=>array('index'), + 'linkOptions'=>array('class'=>'iconlink'), + ), + array( + 'label'=>'Nuevo usuarioNuevo usuario', + 'url'=>array('create'), + 'linkOptions'=>array('class'=>'iconlink2'), + ), + array( + 'label'=>'Ver usuarioVer usuario', + 'url'=>array('view', 'id'=>$model->id), + 'linkOptions'=>array('class'=>'iconlink2'), + ), ); +$this->pageTitle=Yii::t('intranet', 'Modificar usuario ') . $model->username; ?> -

Update Usuario id; ?>

- renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file diff --git a/www/protected/views/usuario/view.php b/www/protected/views/usuario/view.php index 3ee1abe..f40f794 100644 --- a/www/protected/views/usuario/view.php +++ b/www/protected/views/usuario/view.php @@ -1,28 +1,44 @@ breadcrumbs=array( - 'Usuarios'=>array('index'), - $model->name, + Yii::t('intranet', 'Usuarios')=>array('index'), + //(count($dataProvider) == 1) ? $dataProvider->name : 'Ver usuarios', + Yii::t('intranet', 'Ver usuarios'), ); $this->menu=array( - array('label'=>'List Usuario', 'url'=>array('index')), - array('label'=>'Create Usuario', 'url'=>array('create')), - array('label'=>'Update Usuario', 'url'=>array('update', 'id'=>$model->id)), - array('label'=>'Delete Usuario', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Are you sure you want to delete this item?')), - array('label'=>'Manage Usuario', 'url'=>array('admin')), + array( + 'label'=>'Lista de usuariosLista de usuarios', + 'url'=>array('index'), + 'linkOptions'=>array('class'=>'iconlink'), + ), + array( + 'label'=>'Nuevo usuarioNuevo usuario', + 'url'=>array('create'), + 'linkOptions'=>array('class'=>'iconlink2'), + ), + array( + 'label'=>'Modificar usuarioModificar usuario', + //'url'=>array('view', 'id'=>$model->id), + 'linkOptions'=>array('class'=>'iconlink2'), + ), + array( + 'label'=>'Eliminar usuarioEliminar usuario', + 'url'=>'#', + 'linkOptions'=>array( + 'class'=>'iconlink2', + //'submit'=>array('delete','id'=>$model->id), + 'confirm'=>'Are you sure you want to delete this item?', + ), + ), ); + +//$this->pageTitle='Usuario ' . $model->name . ' (' . $model->username . ')'; ?> -

View Usuario #id; ?>

- -widget('zii.widgets.CDetailView', array( - 'data'=>$model, - 'attributes'=>array( - 'id', - 'email', - 'name', - 'username', - 'password', - 'last_login_time', - ), +widget('zii.widgets.CListView', array( + 'dataProvider'=>$dataProvider, + 'itemView'=>'_view', + 'enablePagination'=>false, + 'summaryText'=>'', )); ?> + diff --git a/www/themes/intranet/views/candidato/_form.php b/www/themes/intranet/views/candidato/_form.php deleted file mode 100644 index 9d442d4..0000000 --- a/www/themes/intranet/views/candidato/_form.php +++ /dev/null @@ -1,168 +0,0 @@ -clientScript->registerScriptFile(Yii::app()->theme->baseUrl . '/js/custom/elements.js'); -?> - -beginWidget('CActiveForm', array( - 'id'=>'candidato-form', - 'enableAjaxValidation'=>false, - 'htmlOptions'=>array('enctype' => 'multipart/form-data'), -)); ?> - -
-
- -

Los campos marcados con * son obligatorios.

-
- - errorSummary($model, "", "", array('class'=>"notification msgerror")); ?> -
-
-
-

- - Datos personales - -

-
-
- labelEx($model,'foto', array('class'=>'nopadding')); ?> -
- foto, $model->nombre, - array("title" => $model->nombre, "width"=>"120", "height"=>"120") - ); ?> - - error($model,'foto', array('class'=>'error')); ?> -
-
- -
- labelEx($model,'nombre'); ?> -
- textField($model,'nombre',array('maxlength'=>255,'class'=>'mf')); ?> - error($model,'nombre', array('class'=>'error')); ?> -
-
- -
- labelEx($model,'apellidos'); ?> -
- textField($model,'apellidos',array('maxlength'=>255,'class'=>'lf')); ?> - error($model,'apellidos', array('class'=>'error')); ?> -
-
- -
- labelEx($model,'sexo', array('class'=>'nopadding')); ?> -
- sexo, - $model->OpcionesGenero, - array('separator'=>'    ')); - echo strip_tags($cadena, ''); - ?> - error($model,'sexo', array('class'=>'error')); ?> -
-
- -
- labelEx($model,'dni'); ?> -
- textField($model,'dni',array('maxlength'=>255,'class'=>'sf')); ?> - error($model,'dni', array('class'=>'error')); ?> -
-
- -
- labelEx($model,'fecha_nacimiento'); ?> -
- textField($model,'fecha_nacimiento',array('class'=>'sf','id'=>'datepicker')); ?> - error($model,'fecha_nacimiento', array('class'=>'error')); ?> -
-
- -
- labelEx($model,'lugar_nacimiento'); ?> -
- textField($model,'lugar_nacimiento',array('maxlength'=>255,'class'=>'lf')); ?> - error($model,'lugar_nacimiento', array('class'=>'error')); ?> -
-
-
-
-
-
-
-

- - Datos de contacto - -

-
-
- labelEx($model,'telefono_fijo'); ?> -
- textField($model,'telefono_fijo',array('maxlength'=>255,'class'=>'sf')); ?> - error($model,'telefono_fijo', array('class'=>'error')); ?> -
-
-
- labelEx($model,'telefono_movil'); ?> -
- textField($model,'telefono_movil',array('maxlength'=>255,'class'=>'sf')); ?> - error($model,'telefono_movil', array('class'=>'error')); ?> -
-
-
- labelEx($model,'email'); ?> -
- textField($model,'email',array('maxlength'=>255,'class'=>'mf')); ?> - error($model,'email', array('class'=>'error')); ?> -
- -
-
- labelEx($model,'localidad'); ?> -
- findAll(),'id', 'poblacion', 'provincia_id'); - $provincias = Provincia::model()->findAll(); - - foreach ($provincias as $provincia) { - if (array_key_exists($provincia->id, $lista)) { - $lista[$provincia->provincia] = $lista[$provincia->id]; - unset($lista[$provincia->id]); - } - } - echo CHtml::dropDownList( - 'localidad', - $model->localidad, - $lista, - array( - 'empty'=>'', - 'class'=>'mf', - )); - ?> - error($model,'localidad', array('class'=>'error')); ?> -
-
- -
-
-
-
-
-

- - Datos académicos - -

-
-
- -
- -
-endWidget(); ?> - diff --git a/www/themes/intranet/views/candidato/_search.php b/www/themes/intranet/views/candidato/_search.php deleted file mode 100644 index 0d15cd5..0000000 --- a/www/themes/intranet/views/candidato/_search.php +++ /dev/null @@ -1,89 +0,0 @@ -
- -beginWidget('CActiveForm', array( - 'action'=>Yii::app()->createUrl($this->route), - 'method'=>'get', -)); ?> - -
- label($model,'id'); ?> - textField($model,'id'); ?> -
- -
- label($model,'foto'); ?> - textField($model,'foto',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'dni'); ?> - textField($model,'dni',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'nombre'); ?> - textField($model,'nombre',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'apellidos'); ?> - textField($model,'apellidos',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'email'); ?> - textField($model,'email',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'telefono_fijo'); ?> - textField($model,'telefono_fijo',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'telefono_movil'); ?> - textField($model,'telefono_movil',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'sexo'); ?> - textField($model,'sexo',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'fecha_nacimiento'); ?> - textField($model,'fecha_nacimiento'); ?> -
- -
- label($model,'lugar_nacimiento'); ?> - textField($model,'lugar_nacimiento',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'fecha_alta'); ?> - textField($model,'fecha_alta'); ?> -
- -
- label($model,'usuario_alta'); ?> - textField($model,'usuario_alta'); ?> -
- -
- label($model,'fecha_modificacion'); ?> - textField($model,'fecha_modificacion'); ?> -
- -
- label($model,'usuario_modificacion'); ?> - textField($model,'usuario_modificacion'); ?> -
- -
- -
- -endWidget(); ?> - -
\ No newline at end of file diff --git a/www/themes/intranet/views/candidato/_view.php b/www/themes/intranet/views/candidato/_view.php deleted file mode 100644 index b2fbc5e..0000000 --- a/www/themes/intranet/views/candidato/_view.php +++ /dev/null @@ -1,66 +0,0 @@ -
- - getAttributeLabel('id')); ?>: - id), array('view', 'id'=>$data->id)); ?> -
- - getAttributeLabel('foto')); ?>: - foto); ?> -
- - getAttributeLabel('dni')); ?>: - dni); ?> -
- - getAttributeLabel('nombre')); ?>: - nombre); ?> -
- - getAttributeLabel('apellidos')); ?>: - apellidos); ?> -
- - getAttributeLabel('email')); ?>: - email); ?> -
- - getAttributeLabel('telefono_fijo')); ?>: - telefono_fijo); ?> -
- - getAttributeLabel('telefono_movil')); ?>: - telefono_movil); ?> -
- - getAttributeLabel('sexo')); ?>: - sexo); ?> -
- - getAttributeLabel('fecha_nacimiento')); ?>: - fecha_nacimiento); ?> -
- - getAttributeLabel('lugar_nacimiento')); ?>: - lugar_nacimiento); ?> -
- - getAttributeLabel('fecha_alta')); ?>: - fecha_alta); ?> -
- - getAttributeLabel('usuario_alta')); ?>: - usuario_alta); ?> -
- - getAttributeLabel('fecha_modificacion')); ?>: - fecha_modificacion); ?> -
- - getAttributeLabel('usuario_modificacion')); ?>: - usuario_modificacion); ?> -
- - */ ?> - -
\ No newline at end of file diff --git a/www/themes/intranet/views/candidato/admin.php b/www/themes/intranet/views/candidato/admin.php deleted file mode 100644 index 8ab7d67..0000000 --- a/www/themes/intranet/views/candidato/admin.php +++ /dev/null @@ -1,66 +0,0 @@ -breadcrumbs=array( - 'Candidatos'=>array('index'), - 'Manage', -); - -$this->menu=array( - array('label'=>'List Candidato', 'url'=>array('index')), - array('label'=>'Create Candidato', 'url'=>array('create')), -); - -Yii::app()->clientScript->registerScript('search', " -$('.search-button').click(function(){ - $('.search-form').toggle(); - return false; -}); -$('.search-form form').submit(function(){ - $.fn.yiiGridView.update('candidato-grid', { - data: $(this).serialize() - }); - return false; -}); -"); -?> - -

Manage Candidatos

- -

-You may optionally enter a comparison operator (<, <=, >, >=, <> -or =) at the beginning of each of your search values to specify how the comparison should be done. -

- -'search-button')); ?> - - -widget('zii.widgets.grid.CGridView', array( - 'id'=>'candidato-grid', - 'dataProvider'=>$model->search(), - 'filter'=>$model, - 'columns'=>array( - 'id', - 'foto', - 'dni', - 'nombre', - 'apellidos', - 'email', - /* - 'telefono_fijo', - 'telefono_movil', - 'sexo', - 'fecha_nacimiento', - 'lugar_nacimiento', - 'fecha_alta', - 'usuario_alta', - 'fecha_modificacion', - 'usuario_modificacion', - */ - array( - 'class'=>'CButtonColumn', - ), - ), -)); ?> diff --git a/www/themes/intranet/views/candidato/create.php b/www/themes/intranet/views/candidato/create.php deleted file mode 100644 index c34b7f0..0000000 --- a/www/themes/intranet/views/candidato/create.php +++ /dev/null @@ -1,18 +0,0 @@ -breadcrumbs=array( - 'Candidatos'=>array('index'), - 'Nuevo candidato', -); -$this->menu=array( - array( - 'label'=>'Lista de candidatosLista de candidatos', - 'url'=>array('index'), - 'linkOptions'=>array('class'=>'iconlink'), - ), -); -$this->pageTitle='Nuevo candidato'; -?> - -renderPartial('_form', array( - 'model'=>$model, - )); ?> \ No newline at end of file diff --git a/www/themes/intranet/views/candidato/index.php b/www/themes/intranet/views/candidato/index.php deleted file mode 100644 index 9853b7e..0000000 --- a/www/themes/intranet/views/candidato/index.php +++ /dev/null @@ -1,68 +0,0 @@ -breadcrumbs=array( - 'Candidatos', -); - -$this->menu=array( - array( - 'label'=>'Nuevo candidatoNuevo candidato', - 'url'=>array('create'), - 'linkOptions'=>array('class'=>'iconlink'), - ), -); - -Yii::app()->clientScript->registerScript('search', " -$('.search-button').click(function(){ - $('.search-form').toggle(); - return false; -}); -$('.search-form form').submit(function(){ - $.fn.yiiGridView.update('candidato-grid', { - data: $(this).serialize() - }); - return false; -}); -"); - -$this->pageTitle='Gestión de candidatos'; -?> - -

-You may optionally enter a comparison operator (<, <=, >, >=, <> -or =) at the beginning of each of your search values to specify how the comparison should be done. -

- -'search-button')); ?> - - -widget('zii.widgets.grid.CGridView', array( - 'id'=>'candidato-grid', - 'dataProvider'=>$model->search(), - 'filter'=>$model, - 'columns'=>array( - 'id', - 'foto', - 'dni', - 'nombre', - 'apellidos', - 'email', - /* - 'telefono_fijo', - 'telefono_movil', - 'sexo', - 'fecha_nacimiento', - 'lugar_nacimiento', - 'fecha_alta', - 'usuario_alta', - 'fecha_modificacion', - 'usuario_modificacion', - */ - array( - 'class'=>'CButtonColumn', - ), - ), -)); ?> diff --git a/www/themes/intranet/views/candidato/update.php b/www/themes/intranet/views/candidato/update.php deleted file mode 100644 index 3605992..0000000 --- a/www/themes/intranet/views/candidato/update.php +++ /dev/null @@ -1,18 +0,0 @@ -breadcrumbs=array( - 'Candidatos'=>array('index'), - $model->id=>array('view','id'=>$model->id), - 'Update', -); - -$this->menu=array( - array('label'=>'List Candidato', 'url'=>array('index')), - array('label'=>'Create Candidato', 'url'=>array('create')), - array('label'=>'View Candidato', 'url'=>array('view', 'id'=>$model->id)), - array('label'=>'Manage Candidato', 'url'=>array('admin')), -); -?> - -

Update Candidato id; ?>

- -renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file diff --git a/www/themes/intranet/views/candidato/view.php b/www/themes/intranet/views/candidato/view.php deleted file mode 100644 index 9b73a20..0000000 --- a/www/themes/intranet/views/candidato/view.php +++ /dev/null @@ -1,37 +0,0 @@ -breadcrumbs=array( - 'Candidatos'=>array('index'), - $model->id, -); - -$this->menu=array( - array('label'=>'List Candidato', 'url'=>array('index')), - array('label'=>'Create Candidato', 'url'=>array('create')), - array('label'=>'Update Candidato', 'url'=>array('update', 'id'=>$model->id)), - array('label'=>'Delete Candidato', 'url'=>'#', 'linkOptions'=>array('submit'=>array('delete','id'=>$model->id),'confirm'=>'Are you sure you want to delete this item?')), - array('label'=>'Manage Candidato', 'url'=>array('admin')), -); -?> - -

View Candidato #id; ?>

- -widget('zii.widgets.CDetailView', array( - 'data'=>$model, - 'attributes'=>array( - 'id', - 'foto', - 'dni', - 'nombre', - 'apellidos', - 'email', - 'telefono_fijo', - 'telefono_movil', - 'sexo', - 'fecha_nacimiento', - 'lugar_nacimiento', - 'fecha_alta', - 'usuario_alta', - 'fecha_modificacion', - 'usuario_modificacion', - ), -)); ?> diff --git a/www/themes/intranet/views/site/login.php b/www/themes/intranet/views/site/login.php deleted file mode 100644 index 4eb6a2c..0000000 --- a/www/themes/intranet/views/site/login.php +++ /dev/null @@ -1,48 +0,0 @@ -pageTitle=Yii::app()->name . ' - Login'; -$this->breadcrumbs=array( - 'Login', -); -?> - - - -beginWidget('CActiveForm', array( - 'id'=>'login-form', - 'enableClientValidation'=>true, - 'clientOptions'=>array( - 'validateOnSubmit'=>true, - ), -)); ?> - -error($model,'username', array('class'=>'notification notifyError loginNotify')); - echo $form->error($model,'password', array('class'=>'notification notifyError loginNotify')); - echo $form->error($model,'rememberMe', array('class'=>'notification notifyError loginNotify')); -?> - -
-
-
- labelEx($model,'username');*/ - echo $form->textField($model,'username', array('class'=>'username')); - /*echo $form->labelEx($model,'password'); */ - echo $form->passwordField($model,'password', array('class'=>'password')); - ?> - -
-
-
- -
- checkBox($model,'rememberMe'); - echo $form->label($model,'rememberMe'); - echo $form->error($model,'rememberMe'); - ?> - -
-endWidget(); ?> diff --git a/www/themes/intranet/views/usuario/_form.php b/www/themes/intranet/views/usuario/_form.php deleted file mode 100644 index 08c4922..0000000 --- a/www/themes/intranet/views/usuario/_form.php +++ /dev/null @@ -1,74 +0,0 @@ -beginWidget('CActiveForm', array( - 'id'=>'usuario-form', - 'enableAjaxValidation'=>false, -)); ?> - - -
-
- -

Los campos marcados con * son obligatorios.

-
- - errorSummary($model, "", "", array('class'=>"notification msgerror")); ?> -
-
- -
-

- - Datos del usuario - -

-
-
- labelEx($model,'name'); ?> -
- textField($model,'name',array('maxlength'=>255,'class'=>'mf')); ?> - error($model,'name', array('class'=>'error')); ?> -
-
- -
- labelEx($model,'email'); ?> -
- textField($model,'email',array('maxlength'=>255,'class'=>'mf')); ?> - error($model,'email', array('class'=>'error')); ?> -
-
- -
- labelEx($model,'username'); ?> -
- textField($model,'username',array('maxlength'=>255,'class'=>'mf')); ?> - error($model,'username', array('class'=>'error')); ?> -
- -
- -
- labelEx($model,'password'); ?> -
- passwordField($model,'password',array('maxlength'=>255, 'class'=>'sf')); ?> - error($model,'password', array('class'=>'error')); ?> -
-
- -
- labelEx($model,'password_repeat'); ?> -
- passwordField($model,'password_repeat',array('maxlength'=>255, 'class'=>'sf')); ?> - error($model,'password_repeat', array('class'=>'error')); ?> -
-
- -
- -
-
-
- -
- -endWidget(); ?> - diff --git a/www/themes/intranet/views/usuario/_search.php b/www/themes/intranet/views/usuario/_search.php deleted file mode 100644 index da5e619..0000000 --- a/www/themes/intranet/views/usuario/_search.php +++ /dev/null @@ -1,39 +0,0 @@ -
- -beginWidget('CActiveForm', array( - 'action'=>Yii::app()->createUrl($this->route), - 'method'=>'get', -)); ?> - -
- label($model,'id'); ?> - textField($model,'id'); ?> -
- -
- label($model,'email'); ?> - textField($model,'email',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'name'); ?> - textField($model,'name',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'username'); ?> - textField($model,'username',array('size'=>60,'maxlength'=>255)); ?> -
- -
- label($model,'last_login_time'); ?> - textField($model,'last_login_time'); ?> -
- -
- -
- -endWidget(); ?> - -
\ No newline at end of file diff --git a/www/themes/intranet/views/usuario/_view.php b/www/themes/intranet/views/usuario/_view.php deleted file mode 100644 index f2639c8..0000000 --- a/www/themes/intranet/views/usuario/_view.php +++ /dev/null @@ -1,24 +0,0 @@ -
-
- [Logo here] -

Usuario

-

-
- - getAttributeLabel('name')); ?>:
- getAttributeLabel('email')); ?>:
- getAttributeLabel('username')); ?>:
- getAttributeLabel('last_login_time')); ?>:
- -
- -
- name); ?>
- email)); ?>
- username); ?> - last_login_time); ?> -
-

-
-
- diff --git a/www/themes/intranet/views/usuario/admin.php b/www/themes/intranet/views/usuario/admin.php deleted file mode 100644 index 3f6c1fe..0000000 --- a/www/themes/intranet/views/usuario/admin.php +++ /dev/null @@ -1,55 +0,0 @@ -breadcrumbs=array( - 'Usuarios'=>array('index'), - 'Manage', -); - -$this->menu=array( - array('label'=>'List Usuario', 'url'=>array('index')), - array('label'=>'Create Usuario', 'url'=>array('create')), -); - -Yii::app()->clientScript->registerScript('search', " -$('.search-button').click(function(){ - $('.search-form').toggle(); - return false; -}); -$('.search-form form').submit(function(){ - $.fn.yiiGridView.update('usuario-grid', { - data: $(this).serialize() - }); - return false; -}); -"); -?> - -

Manage Usuarios

- -

-You may optionally enter a comparison operator (<, <=, >, >=, <> -or =) at the beginning of each of your search values to specify how the comparison should be done. -

- -'search-button')); ?> - - -widget('zii.widgets.grid.CGridView', array( - 'id'=>'usuario-grid', - 'dataProvider'=>$model->search(), - 'filter'=>$model, - 'columns'=>array( - 'id', - 'email', - 'name', - 'username', - 'password', - 'last_login_time', - array( - 'class'=>'CButtonColumn', - ), - ), -)); ?> diff --git a/www/themes/intranet/views/usuario/create.php b/www/themes/intranet/views/usuario/create.php deleted file mode 100644 index bc63067..0000000 --- a/www/themes/intranet/views/usuario/create.php +++ /dev/null @@ -1,16 +0,0 @@ -breadcrumbs=array( - 'Usuarios'=>array('index'), - 'Nuevo usuario', -); -$this->menu=array( - array( - 'label'=>'Lista de usuariosLista de usuarios', - 'url'=>array('index'), - 'linkOptions'=>array('class'=>'iconlink'), - ), -); -$this->pageTitle='Nuevo usuario'; -?> - -renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file diff --git a/www/themes/intranet/views/usuario/index.php b/www/themes/intranet/views/usuario/index.php deleted file mode 100644 index 335ce2f..0000000 --- a/www/themes/intranet/views/usuario/index.php +++ /dev/null @@ -1,62 +0,0 @@ -breadcrumbs=array( - 'Usuarios', -); -$this->menu=array( - array( - 'label'=>'Nuevo usuarioNuevo usuario', - 'url'=>array('create'), - 'linkOptions'=>array('class'=>'iconlink'), - ), -); - -/*$cs=Yii::app()->clientScript; -$cs->registerScriptFile(Yii::app()->baseUrl . '/js/star-rating/jquery.rating.pack.js', CClientScript::POS_HEAD); -$cs->registerScriptFile(Yii::app()->baseUrl . '/js/star-rating/jquery.MetaData.js', CClientScript::POS_HEAD); -$cs->registerCssFile(Yii::app()->baseUrl . '/js/star-rating/jquery.rating.css'); */ - -$this->pageTitle='Gestión de usuarios'; - -Yii::app()->clientScript->registerScript('search', " -$('.search-button').click(function(){ - $('.search-form').toggle(); - return false; -}); -$('.search-form form').submit(function(){ - $.fn.yiiGridView.update('usuario-grid', { - data: $(this).serialize() - }); - return false; -}); -"); - -?> - -

-You may optionally enter a comparison operator (<, <=, >, >=, <> -or =) at the beginning of each of your search values to specify how the comparison should be done. -

- -'search-button')); ?> - - -widget('zii.widgets.grid.CGridView', array( - 'id'=>'usuario-grid', - 'dataProvider'=>$model->search(), - 'filter'=>$model, - 'columns'=>array( - 'id', - 'username', - 'name', - 'email', - 'last_login_time', - array( - 'class'=>'CButtonColumn', - ), - ), -)); ?> - diff --git a/www/themes/intranet/views/usuario/update.php b/www/themes/intranet/views/usuario/update.php deleted file mode 100644 index 9f8ae60..0000000 --- a/www/themes/intranet/views/usuario/update.php +++ /dev/null @@ -1,26 +0,0 @@ -breadcrumbs=array( - 'Usuarios'=>array('index'), - 'Modificar usuario', -); -$this->menu=array( - array( - 'label'=>'Lista de usuariosLista de usuarios', - 'url'=>array('index'), - 'linkOptions'=>array('class'=>'iconlink'), - ), - array( - 'label'=>'Nuevo usuarioNuevo usuario', - 'url'=>array('create'), - 'linkOptions'=>array('class'=>'iconlink2'), - ), - array( - 'label'=>'Ver usuarioVer usuario', - 'url'=>array('view', 'id'=>$model->id), - 'linkOptions'=>array('class'=>'iconlink2'), - ), -); -$this->pageTitle='Modificar usuario ' . $model->username; -?> - -renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file diff --git a/www/themes/intranet/views/usuario/view.php b/www/themes/intranet/views/usuario/view.php deleted file mode 100644 index 3087be6..0000000 --- a/www/themes/intranet/views/usuario/view.php +++ /dev/null @@ -1,44 +0,0 @@ -breadcrumbs=array( - 'Usuarios'=>array('index'), - //(count($dataProvider) == 1) ? $dataProvider->name : 'Ver usuarios', - 'Ver usuarios', -); - -$this->menu=array( - array( - 'label'=>'Lista de usuariosLista de usuarios', - 'url'=>array('index'), - 'linkOptions'=>array('class'=>'iconlink'), - ), - array( - 'label'=>'Nuevo usuarioNuevo usuario', - 'url'=>array('create'), - 'linkOptions'=>array('class'=>'iconlink2'), - ), - array( - 'label'=>'Modificar usuarioModificar usuario', - //'url'=>array('view', 'id'=>$model->id), - 'linkOptions'=>array('class'=>'iconlink2'), - ), - array( - 'label'=>'Eliminar usuarioEliminar usuario', - 'url'=>'#', - 'linkOptions'=>array( - 'class'=>'iconlink2', - //'submit'=>array('delete','id'=>$model->id), - 'confirm'=>'Are you sure you want to delete this item?', - ), - ), -); - -//$this->pageTitle='Usuario ' . $model->name . ' (' . $model->username . ')'; -?> - -widget('zii.widgets.CListView', array( - 'dataProvider'=>$dataProvider, - 'itemView'=>'_view', - 'enablePagination'=>false, - 'summaryText'=>'', -)); ?> -