diff --git a/.gitignore b/.gitignore index 525bfb1d968544b13ebf172bbf0dd8c3b4179f81..8ead07700a59405913e9a5477648bd8eb3baf480 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ ~dev_rating/application/cache/ ~dev_rating/application/logs/*/ ~dev_rating/application/config/ +~dev_rating/static/* +!~dev_rating/static/img/ +deploy/node_modules nbproject/ *.*~ /.project @@ -8,4 +11,4 @@ nbproject/ ~dev_rating/.idea/ /~dev_rating/modules/unittest/vendor/ db/disciplines activity.sql -~dev_rating/system/vendor \ No newline at end of file +~dev_rating/system/vendor diff --git a/~dev_rating/deployConfig/database.php b/config/database.php similarity index 100% rename from ~dev_rating/deployConfig/database.php rename to config/database.php diff --git a/~dev_rating/deployConfig/general.json b/config/general.json similarity index 100% rename from ~dev_rating/deployConfig/general.json rename to config/general.json diff --git a/~dev_rating/deployConfig/security.php b/config/security.php similarity index 100% rename from ~dev_rating/deployConfig/security.php rename to config/security.php diff --git a/~dev_rating/deployConfig/session.php b/config/session.php similarity index 100% rename from ~dev_rating/deployConfig/session.php rename to config/session.php diff --git a/~dev_rating/deployConfig/twig.php b/config/twig.php similarity index 100% rename from ~dev_rating/deployConfig/twig.php rename to config/twig.php diff --git a/deploy/Makefile b/deploy/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..d25cd2c913eb00b4bbf5c40a405426fa3e599247 --- /dev/null +++ b/deploy/Makefile @@ -0,0 +1,7 @@ +all: install_gulp + @ + +install: install_gulp + +install_gulp: + $(MAKE) build -C ./gulp diff --git a/deploy/gulp/Makefile b/deploy/gulp/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..163c3a37d50f3a71701826a03c203712cc6f464d --- /dev/null +++ b/deploy/gulp/Makefile @@ -0,0 +1,8 @@ +GULP_DEP := gulp gulp-rename gulp-concat-css gulp-minify-css gulp-less gulp-autoprefixer +INSTALL_PATH := ../ +LOCAL_FLAGS := --save-dev --prefix $(INSTALL_PATH) + +build: + npm install -g gulp + npm install $(LOCAL_FLAGS) $(GULP_DEP) + diff --git a/deploy/gulp/gulp-install.bat b/deploy/gulp/gulp-install.bat new file mode 100644 index 0000000000000000000000000000000000000000..be1c5eb683da762ba357d8c99a1ff2b5381ef524 --- /dev/null +++ b/deploy/gulp/gulp-install.bat @@ -0,0 +1,2 @@ +call npm install -g gulp +call npm install --save-dev --prefix ../ gulp gulp-rename gulp-concat-css gulp-minify-css gulp-less gulp-autoprefixer diff --git a/deploy/gulp/gulp-install.sh b/deploy/gulp/gulp-install.sh new file mode 100644 index 0000000000000000000000000000000000000000..abecf162fd3ec709ecf3def82e616f6553ab19e2 --- /dev/null +++ b/deploy/gulp/gulp-install.sh @@ -0,0 +1,2 @@ +npm install -g gulp +npm install --save-dev --prefix ../ gulp gulp-rename gulp-concat-css gulp-minify-css gulp-less gulp-autoprefixer diff --git a/deploy/gulpfile.js b/deploy/gulpfile.js new file mode 100644 index 0000000000000000000000000000000000000000..8e8a15a01e1699bcfc1109658014e85a8850d835 --- /dev/null +++ b/deploy/gulpfile.js @@ -0,0 +1,124 @@ +'use strict'; +var fs = require('fs'); +var gulp = require('gulp'); + +// gulp plugins +var less = require('gulp-less'); +//var prefix = require('gulp-autoprefixer'); //префиксы +//var concatCss = require('gulp-concat-css'); //конкатенация +//var minifyCss = require('gulp-minify-css'); //минификация +//var rename = require('gulp-rename'); //переименовывание + + + + +// ============================= +// paths +// ============================= + +var sysPath = { + root: '../', + app: '../~dev_rating/', +}; + +var srcPath = { + css: sysPath.root + 'media/css/', + less: sysPath.root + 'media/less/', + js: sysPath.root + 'media/js/', + media: sysPath.root + 'media/', + config: sysPath.root + 'config/', +}; + +var dstPath = { + css: sysPath.app + 'static/css/', + less: sysPath.app + 'static/css/', + js: sysPath.app + 'static/js/', + media: sysPath.app + 'static/', + config: sysPath.app + 'application/config/', +}; + + + +// ============================= +// rules +// ============================= + +gulp.task('less:compile', function () { + gulp.src(srcPath.less + '**/*.less') + .pipe(less()) + .pipe(gulp.dest(dstPath.css)); +}); + +gulp.task('css:copy', function() { + gulp.src(srcPath.css + '**/*.css') + .pipe(gulp.dest(dstPath.css)); +}); + +gulp.task('js:copy', function() { + gulp.src(srcPath.js + '**/*.js') + .pipe(gulp.dest(dstPath.js)); +}); + +gulp.task('config:copy', function() { + gulp.src(srcPath.config + '*') + .pipe(gulp.dest(dstPath.config)); +}); + +gulp.task('folders:create', function() { + var dirs = [ + sysPath.app + 'application/logs/', + sysPath.app + 'application/cache/', + sysPath.app + 'application/cache/twig/' + ]; + fs.mkdir(dirs[0], function() {}); + fs.mkdir(dirs[1], function() { + fs.mkdir(dirs[2], function() {}); + }); +}); + +// gulp.task('css', ['less'], function() { +// return gulp.src('css/*.css') +// .pipe(concatCss('styles/bundle.css')) +// .pipe(prefix('last 2 versions', '> 1%', 'ie9')) +// .pipe(minifyCss('')) +// .pipe(rename({suffix: '.min'})) +// .pipe(gulp.dest('out/')); +// }); + +// gulp.task('copyHtml', function() { +// gulp.src('source/*.html').pipe(gulp.dest('public')); +// }); + + + +// ============================= +// watch +// ============================= + +gulp.task('watch', function () { + gulp.watch(srcPath.css + '*.css', ['css:copy']); + gulp.watch(srcPath.less + '*.less', ['less:compile']); +}); + + + + +// ============================= +// common tasks +// ============================= + +gulp.task('config', [ + 'config:copy' +]); + +gulp.task('default', [ + 'less:compile', + 'css:copy', + 'js:copy', +]); + +gulp.task('install', [ + 'folders:create', + 'config', + 'default' +]); diff --git a/init_data/law faculty/students.csv b/deploy/init_data/law faculty/students.csv similarity index 100% rename from init_data/law faculty/students.csv rename to deploy/init_data/law faculty/students.csv diff --git a/init_data/law faculty/subjects.csv b/deploy/init_data/law faculty/subjects.csv similarity index 100% rename from init_data/law faculty/subjects.csv rename to deploy/init_data/law faculty/subjects.csv diff --git a/init_data/law faculty/teachers.csv b/deploy/init_data/law faculty/teachers.csv similarity index 100% rename from init_data/law faculty/teachers.csv rename to deploy/init_data/law faculty/teachers.csv diff --git a/init_data/mmcs faculty/english teachers.csv b/deploy/init_data/mmcs faculty/english teachers.csv similarity index 100% rename from init_data/mmcs faculty/english teachers.csv rename to deploy/init_data/mmcs faculty/english teachers.csv diff --git a/init_data/mmcs faculty/ped and masters students.csv b/deploy/init_data/mmcs faculty/ped and masters students.csv similarity index 100% rename from init_data/mmcs faculty/ped and masters students.csv rename to deploy/init_data/mmcs faculty/ped and masters students.csv diff --git a/init_data/mmcs faculty/ped subjects.csv b/deploy/init_data/mmcs faculty/ped subjects.csv similarity index 100% rename from init_data/mmcs faculty/ped subjects.csv rename to deploy/init_data/mmcs faculty/ped subjects.csv diff --git a/init_data/mmcs faculty/pedagogic teachers.csv b/deploy/init_data/mmcs faculty/pedagogic teachers.csv similarity index 100% rename from init_data/mmcs faculty/pedagogic teachers.csv rename to deploy/init_data/mmcs faculty/pedagogic teachers.csv diff --git a/init_data/mmcs faculty/reports/chessWithIds.jasper b/deploy/init_data/mmcs faculty/reports/chessWithIds.jasper similarity index 100% rename from init_data/mmcs faculty/reports/chessWithIds.jasper rename to deploy/init_data/mmcs faculty/reports/chessWithIds.jasper diff --git a/init_data/mmcs faculty/reports/chessWithWords.jasper b/deploy/init_data/mmcs faculty/reports/chessWithWords.jasper similarity index 100% rename from init_data/mmcs faculty/reports/chessWithWords.jasper rename to deploy/init_data/mmcs faculty/reports/chessWithWords.jasper diff --git a/init_data/mmcs faculty/reports/groupList.jasper b/deploy/init_data/mmcs faculty/reports/groupList.jasper similarity index 100% rename from init_data/mmcs faculty/reports/groupList.jasper rename to deploy/init_data/mmcs faculty/reports/groupList.jasper diff --git a/init_data/mmcs faculty/reports/sheet.jasper b/deploy/init_data/mmcs faculty/reports/sheet.jasper similarity index 100% rename from init_data/mmcs faculty/reports/sheet.jasper rename to deploy/init_data/mmcs faculty/reports/sheet.jasper diff --git a/init_data/mmcs faculty/students.csv b/deploy/init_data/mmcs faculty/students.csv similarity index 100% rename from init_data/mmcs faculty/students.csv rename to deploy/init_data/mmcs faculty/students.csv diff --git a/init_data/mmcs faculty/subjects.csv b/deploy/init_data/mmcs faculty/subjects.csv similarity index 100% rename from init_data/mmcs faculty/subjects.csv rename to deploy/init_data/mmcs faculty/subjects.csv diff --git a/init_data/mmcs faculty/teachers other.csv b/deploy/init_data/mmcs faculty/teachers other.csv similarity index 100% rename from init_data/mmcs faculty/teachers other.csv rename to deploy/init_data/mmcs faculty/teachers other.csv diff --git a/init_data/mmcs faculty/teachers.csv b/deploy/init_data/mmcs faculty/teachers.csv similarity index 100% rename from init_data/mmcs faculty/teachers.csv rename to deploy/init_data/mmcs faculty/teachers.csv diff --git a/copy.sh b/deploy/scripts/copy.sh old mode 100755 new mode 100644 similarity index 100% rename from copy.sh rename to deploy/scripts/copy.sh diff --git a/deploy.sh b/deploy/scripts/deploy.sh similarity index 100% rename from deploy.sh rename to deploy/scripts/deploy.sh diff --git a/deploy_release.sh b/deploy/scripts/deploy_release.sh similarity index 100% rename from deploy_release.sh rename to deploy/scripts/deploy_release.sh diff --git a/install.sh b/deploy/scripts/install.sh similarity index 100% rename from install.sh rename to deploy/scripts/install.sh diff --git a/load_and_copy.sh b/deploy/scripts/load_and_copy.sh old mode 100755 new mode 100644 similarity index 100% rename from load_and_copy.sh rename to deploy/scripts/load_and_copy.sh diff --git a/status b/deploy/scripts/status similarity index 100% rename from status rename to deploy/scripts/status diff --git a/update.sh b/deploy/scripts/update.sh old mode 100755 new mode 100644 similarity index 100% rename from update.sh rename to deploy/scripts/update.sh diff --git a/java/AdditionalDBAdm/src/main/webapp/WebPages/sign.twig b/java/AdditionalDBAdm/src/main/webapp/WebPages/sign.twig index cb2ed1e14cce3921ad06cf22a26db76c72f5e88a..2d6930a7f1b72df45d1145b44ad95b3979f09f84 100644 --- a/java/AdditionalDBAdm/src/main/webapp/WebPages/sign.twig +++ b/java/AdditionalDBAdm/src/main/webapp/WebPages/sign.twig @@ -13,17 +13,17 @@ <html> <head> <title>{% block pagename %}Р’С…РѕРґ РІ систему{% endblock %} | {{ System.Title }}</title> - {{ HTML.style('media/css/sign.css')|raw }} - {{ HTML.style('media/css/forms.css')|raw }} - {{ HTML.style('media/css/global.css')|raw }} - {{ HTML.script('media/js/config.js')|raw }} - {{ HTML.script('media/js/jquery-1.11.1.min.js')|raw }} - {{ HTML.script('media/js/sign.js')|raw }} - {{ HTML.script('media/js/jquery-plugins/jquery.placeholder.js')|raw }} - {{ HTML.script('media/js/jquery.sha1.js')|raw }} + {{ HTML.style('static/css/sign.css')|raw }} + {{ HTML.style('static/css/forms.css')|raw }} + {{ HTML.style('static/css/global.css')|raw }} + {{ HTML.script('static/js/config.js')|raw }} + {{ HTML.script('static/js/jquery-1.11.1.min.js')|raw }} + {{ HTML.script('static/js/sign.js')|raw }} + {{ HTML.script('static/js/libs/jquery.placeholder.js')|raw }} + {{ HTML.script('static/js/jquery.sha1.js')|raw }} - {{ HTML.script('media/js/jquery-plugins/jReject/jquery.reject.js')|raw }} - {{ HTML.style('media/js/jquery-plugins/jReject/jquery.reject.css')|raw }} + {{ HTML.script('static/js/libs/jReject/jquery.reject.js')|raw }} + {{ HTML.style('static/js/libs/jReject/jquery.reject.css')|raw }} <script> $(function() { $('input, textarea').placeholder(); diff --git a/~dev_rating/media/css/admin/base.css b/media/css/admin/base.css similarity index 100% rename from ~dev_rating/media/css/admin/base.css rename to media/css/admin/base.css diff --git a/~dev_rating/media/css/admin/infoPage.css b/media/css/admin/infoPage.css similarity index 100% rename from ~dev_rating/media/css/admin/infoPage.css rename to media/css/admin/infoPage.css diff --git a/~dev_rating/media/css/admin/inputGroup.css b/media/css/admin/inputGroup.css similarity index 100% rename from ~dev_rating/media/css/admin/inputGroup.css rename to media/css/admin/inputGroup.css diff --git a/~dev_rating/media/css/admin/macro.css b/media/css/admin/macro.css similarity index 100% rename from ~dev_rating/media/css/admin/macro.css rename to media/css/admin/macro.css diff --git a/~dev_rating/media/css/admin/profilePage.css b/media/css/admin/profilePage.css similarity index 100% rename from ~dev_rating/media/css/admin/profilePage.css rename to media/css/admin/profilePage.css diff --git a/~dev_rating/media/css/admin/searchBox.css b/media/css/admin/searchBox.css similarity index 100% rename from ~dev_rating/media/css/admin/searchBox.css rename to media/css/admin/searchBox.css diff --git a/~dev_rating/media/css/admin/stepByStep.css b/media/css/admin/stepByStep.css similarity index 100% rename from ~dev_rating/media/css/admin/stepByStep.css rename to media/css/admin/stepByStep.css diff --git a/~dev_rating/media/css/discipline.css b/media/css/discipline.css similarity index 100% rename from ~dev_rating/media/css/discipline.css rename to media/css/discipline.css diff --git a/~dev_rating/media/css/forms.css b/media/css/forms.css similarity index 100% rename from ~dev_rating/media/css/forms.css rename to media/css/forms.css diff --git a/~dev_rating/media/css/inputGroup.css b/media/css/inputGroup.css similarity index 100% rename from ~dev_rating/media/css/inputGroup.css rename to media/css/inputGroup.css diff --git a/~dev_rating/media/css/messages.css b/media/css/messages.css similarity index 100% rename from ~dev_rating/media/css/messages.css rename to media/css/messages.css diff --git a/~dev_rating/media/css/pdf/activationTemplate.css b/media/css/pdf/activationTemplate.css similarity index 100% rename from ~dev_rating/media/css/pdf/activationTemplate.css rename to media/css/pdf/activationTemplate.css diff --git a/~dev_rating/media/css/readme.md b/media/css/readme.md similarity index 100% rename from ~dev_rating/media/css/readme.md rename to media/css/readme.md diff --git a/~dev_rating/media/js/admin/accounts/codes.js b/media/js/admin/accounts/codes.js similarity index 100% rename from ~dev_rating/media/js/admin/accounts/codes.js rename to media/js/admin/accounts/codes.js diff --git a/~dev_rating/media/js/admin/students/add.js b/media/js/admin/students/add.js similarity index 100% rename from ~dev_rating/media/js/admin/students/add.js rename to media/js/admin/students/add.js diff --git a/~dev_rating/media/js/admin/students/index.js b/media/js/admin/students/index.js similarity index 100% rename from ~dev_rating/media/js/admin/students/index.js rename to media/js/admin/students/index.js diff --git a/~dev_rating/media/js/admin/students/upload.js b/media/js/admin/students/upload.js similarity index 100% rename from ~dev_rating/media/js/admin/students/upload.js rename to media/js/admin/students/upload.js diff --git a/~dev_rating/media/js/admin/teachers/add.js b/media/js/admin/teachers/add.js similarity index 100% rename from ~dev_rating/media/js/admin/teachers/add.js rename to media/js/admin/teachers/add.js diff --git a/~dev_rating/media/js/admin/teachers/index.js b/media/js/admin/teachers/index.js similarity index 100% rename from ~dev_rating/media/js/admin/teachers/index.js rename to media/js/admin/teachers/index.js diff --git a/~dev_rating/media/js/admin/teachers/upload.js b/media/js/admin/teachers/upload.js similarity index 100% rename from ~dev_rating/media/js/admin/teachers/upload.js rename to media/js/admin/teachers/upload.js diff --git a/~dev_rating/media/js/config.js b/media/js/config.js similarity index 100% rename from ~dev_rating/media/js/config.js rename to media/js/config.js diff --git a/~dev_rating/media/js/dean_office/credits.js b/media/js/dean/credits.js similarity index 100% rename from ~dev_rating/media/js/dean_office/credits.js rename to media/js/dean/credits.js diff --git a/~dev_rating/media/js/dean_office/dean_office.js b/media/js/dean/dean.js similarity index 100% rename from ~dev_rating/media/js/dean_office/dean_office.js rename to media/js/dean/dean.js diff --git a/~dev_rating/media/js/discipline/CreateCoursework.js b/media/js/discipline/createCoursework.js similarity index 100% rename from ~dev_rating/media/js/discipline/CreateCoursework.js rename to media/js/discipline/createCoursework.js diff --git a/~dev_rating/media/js/discipline/CreateDiscipline.js b/media/js/discipline/createDiscipline.js similarity index 100% rename from ~dev_rating/media/js/discipline/CreateDiscipline.js rename to media/js/discipline/createDiscipline.js diff --git a/~dev_rating/media/js/discipline/DisciplineList.js b/media/js/discipline/disciplineList.js similarity index 100% rename from ~dev_rating/media/js/discipline/DisciplineList.js rename to media/js/discipline/disciplineList.js diff --git a/~dev_rating/media/js/discipline/EditGroups.js b/media/js/discipline/editGroups.js similarity index 100% rename from ~dev_rating/media/js/discipline/EditGroups.js rename to media/js/discipline/editGroups.js diff --git a/~dev_rating/media/js/discipline/EditSettings.js b/media/js/discipline/editSettings.js similarity index 100% rename from ~dev_rating/media/js/discipline/EditSettings.js rename to media/js/discipline/editSettings.js diff --git a/~dev_rating/media/js/discipline/EditStructure.js b/media/js/discipline/editStructure.js similarity index 100% rename from ~dev_rating/media/js/discipline/EditStructure.js rename to media/js/discipline/editStructure.js diff --git a/~dev_rating/media/js/discipline/EditStructureLocked.js b/media/js/discipline/editStructureLocked.js similarity index 100% rename from ~dev_rating/media/js/discipline/EditStructureLocked.js rename to media/js/discipline/editStructureLocked.js diff --git a/~dev_rating/media/js/discipline/EditStudents.js b/media/js/discipline/editStudents.js similarity index 100% rename from ~dev_rating/media/js/discipline/EditStudents.js rename to media/js/discipline/editStudents.js diff --git a/~dev_rating/media/js/discipline/EditTeachers.js b/media/js/discipline/editTeachers.js similarity index 100% rename from ~dev_rating/media/js/discipline/EditTeachers.js rename to media/js/discipline/editTeachers.js diff --git a/~dev_rating/media/js/discipline/general.js b/media/js/discipline/general.js similarity index 100% rename from ~dev_rating/media/js/discipline/general.js rename to media/js/discipline/general.js diff --git a/~dev_rating/media/js/event_inspector/event_inspector.js b/media/js/event_inspector/eventInspector.js similarity index 100% rename from ~dev_rating/media/js/event_inspector/event_inspector.js rename to media/js/event_inspector/eventInspector.js diff --git a/~dev_rating/media/js/functions.js b/media/js/functions.js similarity index 100% rename from ~dev_rating/media/js/functions.js rename to media/js/functions.js diff --git a/~dev_rating/media/js/javaAuth.js b/media/js/javaAuth.js similarity index 100% rename from ~dev_rating/media/js/javaAuth.js rename to media/js/javaAuth.js diff --git a/~dev_rating/media/js/jquery-plugins/jReject/images/background_browser.gif b/media/js/libs/jReject/images/background_browser.gif similarity index 100% rename from ~dev_rating/media/js/jquery-plugins/jReject/images/background_browser.gif rename to media/js/libs/jReject/images/background_browser.gif diff --git a/~dev_rating/media/js/jquery-plugins/jReject/images/browser_chrome.gif b/media/js/libs/jReject/images/browser_chrome.gif similarity index 100% rename from ~dev_rating/media/js/jquery-plugins/jReject/images/browser_chrome.gif rename to media/js/libs/jReject/images/browser_chrome.gif diff --git a/~dev_rating/media/js/jquery-plugins/jReject/images/browser_firefox.gif b/media/js/libs/jReject/images/browser_firefox.gif similarity index 100% rename from ~dev_rating/media/js/jquery-plugins/jReject/images/browser_firefox.gif rename to media/js/libs/jReject/images/browser_firefox.gif diff --git a/~dev_rating/media/js/jquery-plugins/jReject/images/browser_konqueror.gif b/media/js/libs/jReject/images/browser_konqueror.gif similarity index 100% rename from ~dev_rating/media/js/jquery-plugins/jReject/images/browser_konqueror.gif rename to media/js/libs/jReject/images/browser_konqueror.gif diff --git a/~dev_rating/media/js/jquery-plugins/jReject/images/browser_msie.gif b/media/js/libs/jReject/images/browser_msie.gif similarity index 100% rename from ~dev_rating/media/js/jquery-plugins/jReject/images/browser_msie.gif rename to media/js/libs/jReject/images/browser_msie.gif diff --git a/~dev_rating/media/js/jquery-plugins/jReject/images/browser_opera.gif b/media/js/libs/jReject/images/browser_opera.gif similarity index 100% rename from ~dev_rating/media/js/jquery-plugins/jReject/images/browser_opera.gif rename to media/js/libs/jReject/images/browser_opera.gif diff --git a/~dev_rating/media/js/jquery-plugins/jReject/images/browser_safari.gif b/media/js/libs/jReject/images/browser_safari.gif similarity index 100% rename from ~dev_rating/media/js/jquery-plugins/jReject/images/browser_safari.gif rename to media/js/libs/jReject/images/browser_safari.gif diff --git a/~dev_rating/media/js/jquery-plugins/jReject/jquery.reject.css b/media/js/libs/jReject/jquery.reject.css similarity index 100% rename from ~dev_rating/media/js/jquery-plugins/jReject/jquery.reject.css rename to media/js/libs/jReject/jquery.reject.css diff --git a/~dev_rating/media/js/jquery-plugins/jReject/jquery.reject.js b/media/js/libs/jReject/jquery.reject.js similarity index 100% rename from ~dev_rating/media/js/jquery-plugins/jReject/jquery.reject.js rename to media/js/libs/jReject/jquery.reject.js diff --git a/~dev_rating/media/js/jquery-1.11.1.min.js b/media/js/libs/jquery-1.11.1.min.js similarity index 100% rename from ~dev_rating/media/js/jquery-1.11.1.min.js rename to media/js/libs/jquery-1.11.1.min.js diff --git a/~dev_rating/media/js/jquery-1.9.1.min.js b/media/js/libs/jquery-1.9.1.min.js similarity index 100% rename from ~dev_rating/media/js/jquery-1.9.1.min.js rename to media/js/libs/jquery-1.9.1.min.js diff --git a/~dev_rating/media/js/jquery-2.1.0.min.js b/media/js/libs/jquery-2.1.0.min.js similarity index 100% rename from ~dev_rating/media/js/jquery-2.1.0.min.js rename to media/js/libs/jquery-2.1.0.min.js diff --git a/~dev_rating/media/js/jquery.fileDownload.js b/media/js/libs/jquery.fileDownload.js similarity index 100% rename from ~dev_rating/media/js/jquery.fileDownload.js rename to media/js/libs/jquery.fileDownload.js diff --git a/~dev_rating/media/js/jquery-plugins/jquery.placeholder.js b/media/js/libs/jquery.placeholder.js similarity index 100% rename from ~dev_rating/media/js/jquery-plugins/jquery.placeholder.js rename to media/js/libs/jquery.placeholder.js diff --git a/~dev_rating/media/js/jquery.sha1.js b/media/js/libs/jquery.sha1.js similarity index 100% rename from ~dev_rating/media/js/jquery.sha1.js rename to media/js/libs/jquery.sha1.js diff --git a/~dev_rating/media/js/jquery.uploadfile.min.js b/media/js/libs/jquery.uploadfile.min.js similarity index 100% rename from ~dev_rating/media/js/jquery.uploadfile.min.js rename to media/js/libs/jquery.uploadfile.min.js diff --git a/~dev_rating/media/js/select2.js b/media/js/libs/select2.js similarity index 100% rename from ~dev_rating/media/js/select2.js rename to media/js/libs/select2.js diff --git a/~dev_rating/media/js/messages.js b/media/js/messages.js similarity index 100% rename from ~dev_rating/media/js/messages.js rename to media/js/messages.js diff --git a/~dev_rating/media/js/profile.js b/media/js/profile.js similarity index 100% rename from ~dev_rating/media/js/profile.js rename to media/js/profile.js diff --git a/~dev_rating/media/js/profileSettings.js b/media/js/profileSettings.js similarity index 100% rename from ~dev_rating/media/js/profileSettings.js rename to media/js/profileSettings.js diff --git a/~dev_rating/media/js/rating.js b/media/js/rating.js similarity index 100% rename from ~dev_rating/media/js/rating.js rename to media/js/rating.js diff --git a/~dev_rating/media/js/semesterSwitcher.js b/media/js/semesterSwitcher.js similarity index 100% rename from ~dev_rating/media/js/semesterSwitcher.js rename to media/js/semesterSwitcher.js diff --git a/~dev_rating/media/js/settings.js b/media/js/settings.js similarity index 100% rename from ~dev_rating/media/js/settings.js rename to media/js/settings.js diff --git a/~dev_rating/media/js/sign.js b/media/js/sign.js similarity index 100% rename from ~dev_rating/media/js/sign.js rename to media/js/sign.js diff --git a/~dev_rating/media/js/student/index.js b/media/js/student/index.js similarity index 100% rename from ~dev_rating/media/js/student/index.js rename to media/js/student/index.js diff --git a/~dev_rating/media/js/supportDialog.js b/media/js/supportDialog.js similarity index 100% rename from ~dev_rating/media/js/supportDialog.js rename to media/js/supportDialog.js diff --git a/~dev_rating/media/js/uploadfile.css b/media/js/uploadfile.css similarity index 100% rename from ~dev_rating/media/js/uploadfile.css rename to media/js/uploadfile.css diff --git a/~dev_rating/media/js/wnd/wnd.js b/media/js/wnd/wnd.js similarity index 100% rename from ~dev_rating/media/js/wnd/wnd.js rename to media/js/wnd/wnd.js diff --git a/~dev_rating/media/less/admin/common.less b/media/less/admin/common.less similarity index 100% rename from ~dev_rating/media/less/admin/common.less rename to media/less/admin/common.less diff --git a/~dev_rating/media/less/circles.less b/media/less/circles.less similarity index 100% rename from ~dev_rating/media/less/circles.less rename to media/less/circles.less diff --git a/~dev_rating/media/less/common.less b/media/less/common.less similarity index 100% rename from ~dev_rating/media/less/common.less rename to media/less/common.less diff --git a/~dev_rating/media/less/common/buttons.less b/media/less/common/buttons.less similarity index 100% rename from ~dev_rating/media/less/common/buttons.less rename to media/less/common/buttons.less diff --git a/~dev_rating/media/less/common/forms.less b/media/less/common/forms.less similarity index 100% rename from ~dev_rating/media/less/common/forms.less rename to media/less/common/forms.less diff --git a/~dev_rating/media/less/common/tabs.less b/media/less/common/tabs.less similarity index 100% rename from ~dev_rating/media/less/common/tabs.less rename to media/less/common/tabs.less diff --git a/~dev_rating/media/less/dean_office/dean.less b/media/less/dean_office/dean.less similarity index 100% rename from ~dev_rating/media/less/dean_office/dean.less rename to media/less/dean_office/dean.less diff --git a/~dev_rating/media/less/js/event_inspector.less b/media/less/js/event_inspector.less similarity index 100% rename from ~dev_rating/media/less/js/event_inspector.less rename to media/less/js/event_inspector.less diff --git a/~dev_rating/media/less/js/wnd.less b/media/less/js/wnd.less similarity index 100% rename from ~dev_rating/media/less/js/wnd.less rename to media/less/js/wnd.less diff --git a/~dev_rating/media/less/modal.less b/media/less/modal.less similarity index 100% rename from ~dev_rating/media/less/modal.less rename to media/less/modal.less diff --git a/~dev_rating/media/less/reset.less b/media/less/reset.less similarity index 100% rename from ~dev_rating/media/less/reset.less rename to media/less/reset.less diff --git a/~dev_rating/media/less/select2.css b/media/less/select2.css similarity index 100% rename from ~dev_rating/media/less/select2.css rename to media/less/select2.css diff --git a/~dev_rating/media/less/sign/sign.less b/media/less/sign/sign.less similarity index 100% rename from ~dev_rating/media/less/sign/sign.less rename to media/less/sign/sign.less diff --git a/~dev_rating/media/less/student/index.less b/media/less/student/index.less similarity index 100% rename from ~dev_rating/media/less/student/index.less rename to media/less/student/index.less diff --git a/~dev_rating/media/less/student/subject.less b/media/less/student/subject.less similarity index 100% rename from ~dev_rating/media/less/student/subject.less rename to media/less/student/subject.less diff --git a/~dev_rating/media/less/teacher/discipline/CreateDiscipline.less b/media/less/teacher/discipline/CreateDiscipline.less similarity index 100% rename from ~dev_rating/media/less/teacher/discipline/CreateDiscipline.less rename to media/less/teacher/discipline/CreateDiscipline.less diff --git a/~dev_rating/media/less/teacher/discipline/EditGroups.less b/media/less/teacher/discipline/EditGroups.less similarity index 100% rename from ~dev_rating/media/less/teacher/discipline/EditGroups.less rename to media/less/teacher/discipline/EditGroups.less diff --git a/~dev_rating/media/less/teacher/discipline/EditStructure.less b/media/less/teacher/discipline/EditStructure.less similarity index 100% rename from ~dev_rating/media/less/teacher/discipline/EditStructure.less rename to media/less/teacher/discipline/EditStructure.less diff --git a/~dev_rating/media/less/teacher/discipline/EditStudents.less b/media/less/teacher/discipline/EditStudents.less similarity index 100% rename from ~dev_rating/media/less/teacher/discipline/EditStudents.less rename to media/less/teacher/discipline/EditStudents.less diff --git a/~dev_rating/media/less/teacher/discipline/EditTeachers.less b/media/less/teacher/discipline/EditTeachers.less similarity index 100% rename from ~dev_rating/media/less/teacher/discipline/EditTeachers.less rename to media/less/teacher/discipline/EditTeachers.less diff --git a/~dev_rating/media/less/teacher/index.less b/media/less/teacher/index.less similarity index 100% rename from ~dev_rating/media/less/teacher/index.less rename to media/less/teacher/index.less diff --git a/~dev_rating/media/less/teacher/rating.less b/media/less/teacher/rating.less similarity index 100% rename from ~dev_rating/media/less/teacher/rating.less rename to media/less/teacher/rating.less diff --git a/~dev_rating/media/less/teacher/rating/ExamRating.less b/media/less/teacher/rating/ExamRating.less similarity index 100% rename from ~dev_rating/media/less/teacher/rating/ExamRating.less rename to media/less/teacher/rating/ExamRating.less diff --git a/~dev_rating/media/less/teacher/rating/Rating.less b/media/less/teacher/rating/Rating.less similarity index 100% rename from ~dev_rating/media/less/teacher/rating/Rating.less rename to media/less/teacher/rating/Rating.less diff --git a/~dev_rating/media/less/window/error.less b/media/less/window/error.less similarity index 100% rename from ~dev_rating/media/less/window/error.less rename to media/less/window/error.less diff --git a/~dev_rating/application/views/admin/accounts/codes.twig b/~dev_rating/application/views/admin/accounts/codes.twig index 04b2b049e73767afaebcf442f5a9886752020476..483eaf18d3c2c4120d21f320b0204f31e9e7b9bb 100644 --- a/~dev_rating/application/views/admin/accounts/codes.twig +++ b/~dev_rating/application/views/admin/accounts/codes.twig @@ -1,9 +1,9 @@ {% extends "admin/base" %} {% block media %} - {{ HTML.style('media/css/admin/stepByStep.css')|raw }} - {{ HTML.script('media/js/jquery.fileDownload.js')|raw }} - {{ HTML.script('media/js/admin/accounts/codes.js')|raw }} + {{ HTML.style('static/css/admin/stepByStep.css')|raw }} + {{ HTML.script('static/js/libs/jquery.fileDownload.js')|raw }} + {{ HTML.script('static/js/admin/accounts/codes.js')|raw }} {% endblock %} {% block title %}Аккаунты{% endblock %} diff --git a/~dev_rating/application/views/admin/accounts/index.twig b/~dev_rating/application/views/admin/accounts/index.twig index 377a06bcd3238ba8142b5faeded380c72e8f1e53..50178f6bddc37ed28664a71f0dbefdd74fe8b464 100644 --- a/~dev_rating/application/views/admin/accounts/index.twig +++ b/~dev_rating/application/views/admin/accounts/index.twig @@ -1,8 +1,8 @@ {% extends "admin/base" %} {% block media %} -{{ HTML.style('media/css/admin/searchBox.css')|raw }} -{# {{ HTML.script('media/js/admin/students/index.js')|raw }} #} +{{ HTML.style('static/css/admin/searchBox.css')|raw }} +{# {{ HTML.script('static/js/admin/students/index.js')|raw }} #} {% endblock %} {% block title %}Аккаунты{% endblock %} @@ -10,10 +10,10 @@ {% block main_content %} <div class="action_bar"> - {{ admin.action(URL.site('admin/accounts/getActivationCodes'), URL.site('media/img/codes.png'), 'Получить РєРѕРґС‹ активации', + {{ admin.action(URL.site('admin/accounts/getActivationCodes'), URL.site('static/img/codes.png'), 'Получить РєРѕРґС‹ активации', 'Получить РєРѕРґС‹ активации для неактивированных аккаунтов. '~ 'Система '~System.Title~' сгенерирует PDF-файлы, РІ которых аккаунты Р±СѓРґСѓС‚ отсортированны РїРѕ курсам Рё группам или кафедрам для выбранного факультета') }} - {{ admin.action(URL.site('admin/accounts/getActivationCodes'), URL.site('media/img/codes.png'), 'Получить РєРѕРґС‹ активации', + {{ admin.action(URL.site('admin/accounts/getActivationCodes'), URL.site('static/img/codes.png'), 'Получить РєРѕРґС‹ активации', 'Получить РєРѕРґС‹ активации для неактивированных аккаунтов. '~ 'Система '~System.Title~' сгенерирует PDF-файлы, РІ которых аккаунты Р±СѓРґСѓС‚ отсортированны РїРѕ курсам Рё группам или кафедрам для выбранного факультета') }} </div> diff --git a/~dev_rating/application/views/admin/base.twig b/~dev_rating/application/views/admin/base.twig index ea5cbdc48ff9ed8954d14e06ee74b6f0b85d8700..f8b551572714d4ff953ae3af601ca57356212ec1 100644 --- a/~dev_rating/application/views/admin/base.twig +++ b/~dev_rating/application/views/admin/base.twig @@ -32,15 +32,15 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <title>{% block title %}{% endblock %} | Admin - {{ System.Title }}</title> - {{ HTML.style('media/css/admin/base.css')|raw }} - {{ HTML.style('media/css/admin/macro.css')|raw }} - {#{{ HTML.style('media/css/actionButton.css')|raw }}#} - {{ HTML.style('media/less/common/buttons.css')|raw }} + {{ HTML.style('static/css/admin/base.css')|raw }} + {{ HTML.style('static/css/admin/macro.css')|raw }} + {#{{ HTML.style('static/css/actionButton.css')|raw }}#} + {{ HTML.style('static/css/common/buttons.css')|raw }} - {{ HTML.script('media/js/jquery-1.11.1.min.js')|raw }} - {{ HTML.script('media/js/config.js')|raw }} + {{ HTML.script('static/js/libs/jquery-1.11.1.min.js')|raw }} + {{ HTML.script('static/js/config.js')|raw }} - {{ HTML.script('media/js/event_inspector/event_inspector.js')|raw }} + {{ HTML.script('static/js/event_inspector/eventInspector.js')|raw }} {% block media %}{% endblock %} </head> diff --git a/~dev_rating/application/views/admin/students/add.twig b/~dev_rating/application/views/admin/students/add.twig index 2362fc0c32827a64bb1ae95eaf985d94b6933120..75b14db646d41b0753d2b15e1911f91506496429 100644 --- a/~dev_rating/application/views/admin/students/add.twig +++ b/~dev_rating/application/views/admin/students/add.twig @@ -2,8 +2,8 @@ {% block media %} -{{ HTML.style('media/css/admin/inputGroup.css')|raw }} -{{ HTML.script('media/js/admin/students/add.js')|raw }} +{{ HTML.style('static/css/admin/inputGroup.css')|raw }} +{{ HTML.script('static/js/admin/students/add.js')|raw }} {% endblock %} {% block title %}Студенты{% endblock %} diff --git a/~dev_rating/application/views/admin/students/index.twig b/~dev_rating/application/views/admin/students/index.twig index 62e35b9b8e25f520a7cbfd1f8dbbb2c2ae1b6e56..b48698656dfb3cf86a6aa244382131edcb34349f 100644 --- a/~dev_rating/application/views/admin/students/index.twig +++ b/~dev_rating/application/views/admin/students/index.twig @@ -1,8 +1,8 @@ {% extends "admin/base" %} {% block media %} - {{ HTML.style('media/css/admin/searchBox.css')|raw }} - {{ HTML.script('media/js/admin/students/index.js')|raw }} + {{ HTML.style('static/css/admin/searchBox.css')|raw }} + {{ HTML.script('static/js/admin/students/index.js')|raw }} {% endblock %} {% block title %}Студенты{% endblock %} @@ -11,9 +11,9 @@ {% block main_content %} <div class="action_bar"> - {{ admin.action(URL.site('admin/students/add'), URL.site('media/img/addUser.png'), 'Добавить РЅРѕРІРѕРіРѕ студента', 'Добавить РІ систему '~System.Title~' РЅРѕРІРѕРіРѕ студента. '~ + {{ admin.action(URL.site('admin/students/add'), URL.site('static/img/addUser.png'), 'Добавить РЅРѕРІРѕРіРѕ студента', 'Добавить РІ систему '~System.Title~' РЅРѕРІРѕРіРѕ студента. '~ 'Для него будет создан аккаунт Рё сгенерирован РєРѕРґ активации.') }} - {{ admin.action(URL.site('admin/students/upload'), URL.site('media/img/uploadList.png'), 'Загрузить СЃРїРёСЃРѕРє студентов', + {{ admin.action(URL.site('admin/students/upload'), URL.site('static/img/uploadList.png'), 'Загрузить СЃРїРёСЃРѕРє студентов', 'Загрузить РІ систему '~System.Title~' СЃРїРёСЃРѕРє студентов РёР· заранее подготовленных csv-файлов. '~ 'Для каждого студента, загруженного данной утилитой, будет создан аккаунт Рё сгенерирован РєРѕРґ активации.') }} </div> diff --git a/~dev_rating/application/views/admin/students/profile.twig b/~dev_rating/application/views/admin/students/profile.twig index c31dbbabd1f595f8710eb7e89d4f187da16fc2bd..8c348f75fed798fa9383543922dbb8aa74507a11 100644 --- a/~dev_rating/application/views/admin/students/profile.twig +++ b/~dev_rating/application/views/admin/students/profile.twig @@ -1,8 +1,8 @@ {% extends "admin/base" %} {% block media %} -{{ HTML.style('media/css/admin/profilePage.css')|raw }} -{{ HTML.script('media/js/admin/students/profile.js')|raw }} +{{ HTML.style('static/css/admin/profilePage.css')|raw }} +{{ HTML.script('static/js/admin/students/profile.js')|raw }} {% endblock %} {% block title %}Профиль студента{% endblock %} @@ -43,7 +43,7 @@ </div> </div> <div class="action_bar"> - {{ admin.action(URL.site('handler/AdmAccounts/Deactivate/'), URL.site('media/img/addUser.png'), + {{ admin.action(URL.site('handler/AdmAccounts/Deactivate/'), URL.site('static/img/addUser.png'), 'Отключить аккаунт', 'Прекратить доступ данного аккаунта Рє системе '~System.Title) }} </div> {% endblock %} \ No newline at end of file diff --git a/~dev_rating/application/views/admin/students/upload.twig b/~dev_rating/application/views/admin/students/upload.twig index abc7b15af7f460d7e9b964515595355590ef9e2a..83c40219aa12f9220e3da84af2962e121fc6bf39 100644 --- a/~dev_rating/application/views/admin/students/upload.twig +++ b/~dev_rating/application/views/admin/students/upload.twig @@ -4,8 +4,8 @@ {% block main_top_title %}Загрузка СЃРїРёСЃРєР° студентов{% endblock %} {% block media %} - {{ HTML.style('media/css/admin/stepByStep.css')|raw }} - {{ HTML.script('media/js/admin/students/upload.js')|raw }} + {{ HTML.style('static/css/admin/stepByStep.css')|raw }} + {{ HTML.script('static/js/admin/students/upload.js')|raw }} {% endblock %} {% block main_content %} diff --git a/~dev_rating/application/views/admin/subjects/upload.twig b/~dev_rating/application/views/admin/subjects/upload.twig index 43bee4971c024466defceb74fc1fc784906a58f8..7c28b7e819993ab04b67bfe1df8e0ab673c862ad 100644 --- a/~dev_rating/application/views/admin/subjects/upload.twig +++ b/~dev_rating/application/views/admin/subjects/upload.twig @@ -4,8 +4,8 @@ {% block main_top_title %}Загрузка СЃРїРёСЃРєР° предметов{% endblock %} {% block media %} - {{ HTML.style('media/css/admin/stepByStep.css')|raw }} - {{ HTML.script('media/js/admin/students/upload.js')|raw }} + {{ HTML.style('static/css/admin/stepByStep.css')|raw }} + {{ HTML.script('static/js/admin/students/upload.js')|raw }} {% endblock %} {% block main_content %} diff --git a/~dev_rating/application/views/admin/teachers/add.twig b/~dev_rating/application/views/admin/teachers/add.twig index 8389ba7572d4a926db482545cb92aa39e4011c42..50277c552def2027aafc72831dc067ef0b73d6d3 100644 --- a/~dev_rating/application/views/admin/teachers/add.twig +++ b/~dev_rating/application/views/admin/teachers/add.twig @@ -2,8 +2,8 @@ {% block media %} -{{ HTML.style('media/css/admin/inputGroup.css')|raw }} -{{ HTML.script('media/js/admin/teachers/add.js')|raw }} +{{ HTML.style('static/css/admin/inputGroup.css')|raw }} +{{ HTML.script('static/js/admin/teachers/add.js')|raw }} {% endblock %} {% block title %}Преподаватели{% endblock %} diff --git a/~dev_rating/application/views/admin/teachers/index.twig b/~dev_rating/application/views/admin/teachers/index.twig index e43c2c6e9518a9365de69fc489febb8739c884af..b1517e517af22399aa368fbbad010c888720a68d 100644 --- a/~dev_rating/application/views/admin/teachers/index.twig +++ b/~dev_rating/application/views/admin/teachers/index.twig @@ -1,8 +1,8 @@ {% extends "admin/base" %} {% block media %} -{{ HTML.style('media/css/admin/searchBox.css')|raw }} -{{ HTML.script('media/js/admin/teachers/index.js')|raw }} +{{ HTML.style('static/css/admin/searchBox.css')|raw }} +{{ HTML.script('static/js/admin/teachers/index.js')|raw }} {% endblock %} {% block title %}Преподаватели{% endblock %} @@ -10,9 +10,9 @@ {% block main_content %} <div class="action_bar"> - {{ admin.action(URL.site('admin/teachers/add'), URL.site('media/img/addUser.png'), 'Добавить РЅРѕРІРѕРіРѕ преподавателя', 'Добавить РІ систему '~System.Title~' РЅРѕРІРѕРіРѕ преподавателя. '~ + {{ admin.action(URL.site('admin/teachers/add'), URL.site('static/img/addUser.png'), 'Добавить РЅРѕРІРѕРіРѕ преподавателя', 'Добавить РІ систему '~System.Title~' РЅРѕРІРѕРіРѕ преподавателя. '~ 'Для него будет создан аккаунт Рё сгенерирован РєРѕРґ активации.') }} - {{ admin.action(URL.site('admin/teachers/upload'), URL.site('media/img/uploadList.png'), 'Загрузить СЃРїРёСЃРѕРє преподавателей', + {{ admin.action(URL.site('admin/teachers/upload'), URL.site('static/img/uploadList.png'), 'Загрузить СЃРїРёСЃРѕРє преподавателей', 'Загрузить РІ систему '~System.Title~' СЃРїРёСЃРѕРє преподавателей РёР· заранее подготовленных csv-файлов. '~ 'Для каждого преподавателя, загруженного данной утилитой, будет создан аккаунт Рё сгенерирован РєРѕРґ активации.') }} </div> diff --git a/~dev_rating/application/views/admin/teachers/profile.twig b/~dev_rating/application/views/admin/teachers/profile.twig index 7c0d472b2dd01cc1ad0c1170b690a80d49629fcf..e7a9d1c4085c89a38b176f732d08f16cd307e62c 100644 --- a/~dev_rating/application/views/admin/teachers/profile.twig +++ b/~dev_rating/application/views/admin/teachers/profile.twig @@ -1,8 +1,8 @@ {% extends "admin/base" %} {% block media %} -{{ HTML.style('media/css/admin/profilePage.css')|raw }} -{{ HTML.script('media/js/admin/students/profile.js')|raw }} +{{ HTML.style('static/css/admin/profilePage.css')|raw }} +{{ HTML.script('static/js/admin/students/profile.js')|raw }} {% endblock %} {% block title %}Профиль преподавателя{% endblock %} @@ -43,7 +43,7 @@ </div> </div> <div class="action_bar"> - {{ admin.action(URL.site('handler/AdmAccounts/Deactivate/'), URL.site('media/img/addUser.png'), + {{ admin.action(URL.site('handler/AdmAccounts/Deactivate/'), URL.site('static/img/addUser.png'), 'Деактивировать аккаунт', 'Прекратить доступ данного аккаунта Рє системе '~System.Title) }} </div> {% endblock %} \ No newline at end of file diff --git a/~dev_rating/application/views/admin/teachers/upload.twig b/~dev_rating/application/views/admin/teachers/upload.twig index cd4744053d9fce1367089cf11264d0d8d2785c7b..7753155373e9b2d8db75f2b0683a898cd402ce83 100644 --- a/~dev_rating/application/views/admin/teachers/upload.twig +++ b/~dev_rating/application/views/admin/teachers/upload.twig @@ -4,8 +4,8 @@ {% block main_top_title %}Загрузка СЃРїРёСЃРєР° преподавателей{% endblock %} {% block media %} - {{ HTML.style('media/css/admin/stepByStep.css')|raw }} - {{ HTML.script('media/js/admin/students/upload.js')|raw }} + {{ HTML.style('static/css/admin/stepByStep.css')|raw }} + {{ HTML.script('static/js/admin/students/upload.js')|raw }} {% endblock %} {% block main_content %} diff --git a/~dev_rating/application/views/base.twig b/~dev_rating/application/views/base.twig index 3b06a3c4582f0841db544529f54766825332d458..097569f8b4ec5ceb18762643cb630b3535a84703 100644 --- a/~dev_rating/application/views/base.twig +++ b/~dev_rating/application/views/base.twig @@ -40,32 +40,32 @@ <meta http-equiv="Cache-Control" content="no-cache"> <link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=cyrillic-ext,latin' rel='stylesheet' type='text/css'> - {{ HTML.style('media/less/common.css')|raw }} + {{ HTML.style('static/css/common.css')|raw }} {# - HTML.style('media/css/messages.css') + HTML.style('static/css/messages.css') DEPRECATED: - HTML.style('media/css/theme/jquery-ui.css') - HTML.style('media/css/error.css') - HTML.style('media/css/global.css') + HTML.style('static/css/theme/jquery-ui.css') + HTML.style('static/css/error.css') + HTML.style('static/css/global.css') #} - {{ HTML.script('media/js/jquery-1.11.1.min.js')|raw }} - {{ HTML.script('media/js/config.js')|raw }} + {{ HTML.script('static/js/libs/jquery-1.11.1.min.js')|raw }} + {{ HTML.script('static/js/config.js')|raw }} - {{ HTML.script('media/js/wnd/wnd.js')|raw }} - {{ HTML.script('media/js/event_inspector/event_inspector.js')|raw }} - {{ HTML.script('media/js/supportDialog.js')|raw }} - {{ HTML.script('media/js/semesterSwitcher.js')|raw }} + {{ HTML.script('static/js/wnd/wnd.js')|raw }} + {{ HTML.script('static/js/event_inspector/eventInspector.js')|raw }} + {{ HTML.script('static/js/supportDialog.js')|raw }} + {{ HTML.script('static/js/semesterSwitcher.js')|raw }} - {{ HTML.script('media/js/profile.js')|raw }} - {{ HTML.script('media/js/settings.js')|raw }} - {{ HTML.script('media/js/jquery-plugins/jquery.placeholder.js')|raw }} - {{ HTML.script('media/js/jquery.sha1.js')|raw }} + {{ HTML.script('static/js/profile.js')|raw }} + {{ HTML.script('static/js/settings.js')|raw }} + {{ HTML.script('static/js/libs/jquery.placeholder.js')|raw }} + {{ HTML.script('static/js/libs/jquery.sha1.js')|raw }} {# - {{ HTML.script('media/js/messages.js')|raw }} + {{ HTML.script('static/js/messages.js')|raw }} DEPRECATED: - HTML.script('media/js/ui/jquery-ui.js') - HTML.script('media/js/errDialog.js') + HTML.script('static/js/ui/jquery-ui.js') + HTML.script('static/js/errDialog.js') #} <script> @@ -90,11 +90,11 @@ <div class="navigation"> {# <div id = "top_user_messages"> - {{ HTML.image('media/img/messageIcon.png', {'height': '11px'})|raw }} (1) + {{ HTML.image('static/img/messageIcon.png', {'height': '11px'})|raw }} (1) </div> include 'messages/messages' #} <div id="username"> - {{ HTML.image('media/img/user.png', {'height': '11px'})|raw }} + {{ HTML.image('static/img/user.png', {'height': '11px'})|raw }} {{ User.FirstName }} {{ User.LastName }} </div> | diff --git a/~dev_rating/application/views/dean_office/base.twig b/~dev_rating/application/views/dean_office/base.twig index c37db2ee06e547388e1f81aef9425f9ee06063b2..001dcce28aa478c6121b2ebf06becc64fc21f4ce 100644 --- a/~dev_rating/application/views/dean_office/base.twig +++ b/~dev_rating/application/views/dean_office/base.twig @@ -2,7 +2,7 @@ {% block title %}Деканат{% endblock %} {% block media %} {# head -> css, js #} - {{ HTML.style('media/less/dean_office/dean.css')|raw }} + {{ HTML.style('static/css/dean_office/dean.css')|raw }} {% endblock %} {% block main_content_classes %}sidePadding{% endblock %} diff --git a/~dev_rating/application/views/dean_office/credits.twig b/~dev_rating/application/views/dean_office/credits.twig index 06b8acbddb087797604b1913091ac4eac6ee03bc..6f63f47e55a404bc6c623d08db107c43feeccdbc 100644 --- a/~dev_rating/application/views/dean_office/credits.twig +++ b/~dev_rating/application/views/dean_office/credits.twig @@ -3,12 +3,12 @@ {% block title %}Деканат > Ведомости{% endblock %} {% block media %} {# head -> css, js #} {{ parent() }} - {{ HTML.script('media/js/jquery.fileDownload.js')|raw }} - {{ HTML.style('media/css/discipline.css')|raw }} - {{ HTML.script('media/js/dean_office/credits.js')|raw }} + {{ HTML.script('static/js/libs/jquery.fileDownload.js')|raw }} + {{ HTML.style('static/css/discipline.css')|raw }} + {{ HTML.script('static/js/dean_office/credits.js')|raw }} - {{ HTML.script('media/js/select2.js')|raw }} - {{ HTML.style('media/less/select2.css')|raw }} + {{ HTML.script('static/js/libs/select2.js')|raw }} + {{ HTML.style('static/css/select2.css')|raw }} {% endblock %} {% block main_top_title %}Деканат > Зачеты{% endblock %} {% block dean_content %} diff --git a/~dev_rating/application/views/dean_office/sheets.twig b/~dev_rating/application/views/dean_office/sheets.twig index 0ecb808baed97adcb465c81a0cb55496f5ff30e9..6712a393df7321d4d2d821150195a538ae67e935 100644 --- a/~dev_rating/application/views/dean_office/sheets.twig +++ b/~dev_rating/application/views/dean_office/sheets.twig @@ -3,9 +3,9 @@ {% block title %}Деканат > Ведомости{% endblock %} {% block media %} {# head -> css, js #} {{ parent() }} - {{ HTML.script('media/js/jquery.fileDownload.js')|raw }} - {{ HTML.style('media/css/discipline.css')|raw }} - {{ HTML.script('media/js/dean_office/dean_office.js')|raw }} + {{ HTML.script('static/js/libs/jquery.fileDownload.js')|raw }} + {{ HTML.style('static/css/discipline.css')|raw }} + {{ HTML.script('static/js/dean_office/dean.js')|raw }} {% endblock %} {% block main_top_title %}Деканат > Ведомости{% endblock %} diff --git a/~dev_rating/application/views/dean_office/students/index.twig b/~dev_rating/application/views/dean_office/students/index.twig index faf58bdcdd66859fcbb3175e28771f671c547c4e..8eeff03b0194fdf2bbe2e49749338de7399aad2e 100644 --- a/~dev_rating/application/views/dean_office/students/index.twig +++ b/~dev_rating/application/views/dean_office/students/index.twig @@ -3,9 +3,9 @@ {% block title %}Деканат > Ведомости{% endblock %} {% block media %} {{ parent() }} - {{ HTML.style('media/css/admin/searchBox.css')|raw }} - {{ HTML.script('media/js/admin/students/index.js')|raw }} - {#{{ HTML.script('media/js/common/Studentslist.js')|raw }}#} + {{ HTML.style('static/css/admin/searchBox.css')|raw }} + {{ HTML.script('static/js/admin/students/index.js')|raw }} + {#{{ HTML.script('static/js/common/Studentslist.js')|raw }}#} {% endblock %} {% block main_top_title %}Деканат > Студенты{% endblock %} diff --git a/~dev_rating/application/views/dean_office/students/profile.twig b/~dev_rating/application/views/dean_office/students/profile.twig index fd425ac015c4d12c867f6c3af213f7d5edfe7784..9d1a8e09a72eb99a264defc50014c9e5a68c87a8 100644 --- a/~dev_rating/application/views/dean_office/students/profile.twig +++ b/~dev_rating/application/views/dean_office/students/profile.twig @@ -3,8 +3,8 @@ {% block title %}Деканат > Ведомости{% endblock %} {% block media %} {{ parent() }} - {{ HTML.style('media/css/admin/profilePage.css')|raw }} - {{ HTML.script('media/js/admin/students/profile.js')|raw }} + {{ HTML.style('static/css/admin/profilePage.css')|raw }} + {{ HTML.script('static/js/admin/students/profile.js')|raw }} {% endblock %} {% block main_top_title %}Деканат > Студенты{% endblock %} diff --git a/~dev_rating/application/views/errors/http.twig b/~dev_rating/application/views/errors/http.twig index b7dcdffa2ba4c7de7100a5b3a45665b90f35fce5..0fce6ba4909cc74579e5bf9cf5717d77d5688d86 100644 --- a/~dev_rating/application/views/errors/http.twig +++ b/~dev_rating/application/views/errors/http.twig @@ -2,8 +2,8 @@ <head> <title>{% block pagename %}Ошибка{% endblock %} | {{ System.Title }}</title> <link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=cyrillic-ext,latin' rel='stylesheet' type='text/css'> - {{ HTML.style('media/less/common.css')|raw }} - {{ HTML.style('media/less/sign/sign.css')|raw }} + {{ HTML.style('static/css/common.css')|raw }} + {{ HTML.style('static/css/sign/sign.css')|raw }} <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> </head> diff --git a/~dev_rating/application/views/profile/settings.twig b/~dev_rating/application/views/profile/settings.twig index af17c169a781bf52c7acc32a317c4189e861586f..30aec2666ed70a780e38c5b41c5294e616fd4695 100644 --- a/~dev_rating/application/views/profile/settings.twig +++ b/~dev_rating/application/views/profile/settings.twig @@ -2,8 +2,8 @@ {% block media %} -{{ HTML.style('media/css/inputGroup.css')|raw }} -{{ HTML.script('media/js/profileSettings.js')|raw }} +{{ HTML.style('static/css/inputGroup.css')|raw }} +{{ HTML.script('static/js/profileSettings.js')|raw }} {% endblock %} {% block title %}Профиль{% endblock %} diff --git a/~dev_rating/application/views/sign.twig b/~dev_rating/application/views/sign.twig index 10f216a43d1839099ce2ccb4f873d87b47abe45b..eebf4cef09e001f7bc439a564ca9f456f887631a 100644 --- a/~dev_rating/application/views/sign.twig +++ b/~dev_rating/application/views/sign.twig @@ -15,41 +15,19 @@ <head> <title>{% block pagename %}Р’С…РѕРґ РІ систему{% endblock %} | {{ System.Title }}</title> <link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=cyrillic-ext,latin' rel='stylesheet' type='text/css'> - {{ HTML.style('media/less/common.css')|raw }} - {{ HTML.style('media/less/sign/sign.css')|raw }} + {{ HTML.script('static/js/libs/jquery-1.11.1.min.js')|raw }} + {{ HTML.style('static/css/common.css')|raw }} + {{ HTML.style('static/css/sign/sign.css')|raw }} - {{ HTML.script('media/js/config.js')|raw }} - {{ HTML.script('media/js/jquery-1.11.1.min.js')|raw }} - {{ HTML.script('media/js/sign.js')|raw }} - {{ HTML.script('media/js/jquery-plugins/jquery.placeholder.js')|raw }} - {{ HTML.script('media/js/jquery.sha1.js')|raw }} + {{ HTML.script('static/js/config.js')|raw }} + {{ HTML.script('static/js/libs/jquery.sha1.js')|raw }} + {{ HTML.script('static/js/sign.js')|raw }} + {{ HTML.script('static/js/libs/jquery.placeholder.js')|raw }} + {{ HTML.script('static/js/libs/jquery.sha1.js')|raw }} - {{ HTML.script('media/js/wnd/wnd.js')|raw }} - {{ HTML.script('media/js/event_inspector/event_inspector.js')|raw }} - {{ HTML.script('media/js/supportDialog.js')|raw }} - {# - DEPRECATED? - {{ HTML.script('media/js/jquery-plugins/jReject/jquery.reject.js')|raw }} - {{ HTML.style('media/js/jquery-plugins/jReject/jquery.reject.css')|raw }} - <script> - $(function() { - $('input, textarea').placeholder(); - $.reject({ - reject: { - unknown:true, - msie7:true, - msie8:true - }, - imagePath: 'media/js/jquery-plugins/jReject/images/', - close: false, - header: 'Р’С‹ используете устаревший браузер.', - paragraph1: '', - paragraph2: 'Чтобы использовать РІСЃРµ возможности сайта, загрузите Рё установите последнею версию РѕРґРЅРѕРіРѕ РёР· этих браузеров:', - display: ['firefox','chrome','opera', 'safari'] - }); - }); - </script> - #} + {{ HTML.script('static/js/wnd/wnd.js')|raw }} + {{ HTML.script('static/js/event_inspector/eventInspector.js')|raw }} + {{ HTML.script('static/js/supportDialog.js')|raw }} <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> </head> diff --git a/~dev_rating/application/views/student/index.twig b/~dev_rating/application/views/student/index.twig index de55d3ecf9b391e8aea3ebd6765e546a85a9e9a3..5161d05f89808fb4db67715a44a4705575a72630 100644 --- a/~dev_rating/application/views/student/index.twig +++ b/~dev_rating/application/views/student/index.twig @@ -52,9 +52,9 @@ {% block title %}Дисциплины{% endblock %} {% block media %} - {{ HTML.style('media/less/student/index.css')|raw }} - {{ HTML.style('media/less/circles.css')|raw }} - {{ HTML.script('media/js/student/index.js')|raw }} + {{ HTML.style('static/css/student/index.css')|raw }} + {{ HTML.style('static/css/circles.css')|raw }} + {{ HTML.script('static/js/student/index.js')|raw }} {% endblock %} {% block main_content_classes %}sidePadding{% endblock %} diff --git a/~dev_rating/application/views/student/subject.twig b/~dev_rating/application/views/student/subject.twig index 8e91981850c9a581a09c35cde2767af735127669..46bf779cdb73ca46876247e094967a0bb6a0c9e5 100644 --- a/~dev_rating/application/views/student/subject.twig +++ b/~dev_rating/application/views/student/subject.twig @@ -1,7 +1,7 @@ {% extends 'base' %} {% block media %} {# head -> css, js #} - {{ HTML.style('media/less/student/subject.css')|raw }} + {{ HTML.style('static/css/student/subject.css')|raw }} {% endblock %} {% macro event(event_name, event_date, event_ball, event_max_ball) %} diff --git a/~dev_rating/application/views/teacher/coursework/create.twig b/~dev_rating/application/views/teacher/coursework/create.twig index 17eb3cd085eeef1938e502122dd15914777aa9d8..543b635790b9f7d855e39dcc4beffdb16c51c7c3 100644 --- a/~dev_rating/application/views/teacher/coursework/create.twig +++ b/~dev_rating/application/views/teacher/coursework/create.twig @@ -2,14 +2,14 @@ {% block title %}Конструктор РЈРљР”{% endblock %} {# head -> title #} {% block media %} {# head -> css, js #} - {{ HTML.script('media/js/functions.js')|raw }} + {{ HTML.script('static/js/functions.js')|raw }} - {{ HTML.script('media/js/discipline/general.js')|raw }} - {{ HTML.script('media/js/discipline/CreateCoursework.js')|raw }} - {{ HTML.style('media/less/teacher/discipline/CreateDiscipline.css')|raw }} - {{ HTML.style('media/less/common/tabs.css')|raw }} - {{ HTML.style('media/less/select2.css')|raw }} - {{ HTML.script('media/js/select2.js')|raw }} + {{ HTML.script('static/js/discipline/general.js')|raw }} + {{ HTML.script('static/js/discipline/createCoursework.js')|raw }} + {{ HTML.style('static/css/teacher/discipline/createDiscipline.css')|raw }} + {{ HTML.style('static/css/common/tabs.css')|raw }} + {{ HTML.style('static/css/select2.css')|raw }} + {{ HTML.script('static/js/libs/select2.js')|raw }} {% endblock %} {% block main_top_title %}Создание РєСѓСЂСЃРѕРІРѕР№{% endblock %} diff --git a/~dev_rating/application/views/teacher/discipline/MapBase.twig b/~dev_rating/application/views/teacher/discipline/MapBase.twig index e6a795b896d5cbcb1be425bd72ec1c828e0e9564..2178843ab94303b2d64db46862129de649b81d1b 100644 --- a/~dev_rating/application/views/teacher/discipline/MapBase.twig +++ b/~dev_rating/application/views/teacher/discipline/MapBase.twig @@ -5,10 +5,10 @@ {% if Discipline.Subtype %}РєСѓСЂСЃРѕРІРѕР№{% else %}дисциплины{% endif %} {% endblock %} {# head -> title #} {% block media %} {# head -> css, js #} - {{ HTML.script('media/js/functions.js')|raw }} + {{ HTML.script('static/js/functions.js')|raw }} - {{ HTML.script('media/js/discipline/general.js')|raw }} - {{ HTML.style('media/less/common/tabs.css')|raw }} + {{ HTML.script('static/js/discipline/general.js')|raw }} + {{ HTML.style('static/css/common/tabs.css')|raw }} <script> var g_disciplineID = {{ Discipline.ID }}; </script> diff --git a/~dev_rating/application/views/teacher/discipline/create.twig b/~dev_rating/application/views/teacher/discipline/create.twig index 1154105ef2cef971f099b543d26ebc5568b79426..b9bb2f0b9f55089c46baa66a3ce34c4d2a554829 100644 --- a/~dev_rating/application/views/teacher/discipline/create.twig +++ b/~dev_rating/application/views/teacher/discipline/create.twig @@ -2,14 +2,14 @@ {% block title %}Конструктор РЈРљР”{% endblock %} {# head -> title #} {% block media %} {# head -> css, js #} - {{ HTML.script('media/js/functions.js')|raw }} + {{ HTML.script('static/js/functions.js')|raw }} - {{ HTML.script('media/js/discipline/general.js')|raw }} - {{ HTML.script('media/js/discipline/CreateDiscipline.js')|raw }} - {{ HTML.style('media/less/teacher/discipline/CreateDiscipline.css')|raw }} - {{ HTML.style('media/less/common/tabs.css')|raw }} - {{ HTML.style('media/less/select2.css')|raw }} - {{ HTML.script('media/js/select2.js')|raw }} + {{ HTML.script('static/js/discipline/general.js')|raw }} + {{ HTML.script('static/js/discipline/createDiscipline.js')|raw }} + {{ HTML.style('static/css/teacher/discipline/CreateDiscipline.css')|raw }} + {{ HTML.style('static/css/common/tabs.css')|raw }} + {{ HTML.style('static/css/select2.css')|raw }} + {{ HTML.script('static/js/libs/select2.js')|raw }} {% endblock %} {% block main_top_title %}Создание дисциплины{% endblock %} diff --git a/~dev_rating/application/views/teacher/discipline/edit/groups.twig b/~dev_rating/application/views/teacher/discipline/edit/groups.twig index c1387df0be4ae5879b4bc7711d730fc8cd56a377..60b6344d4f37dcbcdfe9cd8b8f6b58299c1d29c4 100644 --- a/~dev_rating/application/views/teacher/discipline/edit/groups.twig +++ b/~dev_rating/application/views/teacher/discipline/edit/groups.twig @@ -3,8 +3,8 @@ {% set step_4 = 'active' %} {% block discipline_media %} - {{ HTML.style('media/less/teacher/discipline/EditGroups.css')|raw }} - {{ HTML.script('media/js/discipline/EditGroups.js')|raw }} + {{ HTML.style('static/css/teacher/discipline/EditGroups.css')|raw }} + {{ HTML.script('static/js/discipline/editGroups.js')|raw }} {% endblock %} {% block map_content %} diff --git a/~dev_rating/application/views/teacher/discipline/edit/settings.twig b/~dev_rating/application/views/teacher/discipline/edit/settings.twig index 21dece1f6b5c73b218e22b1304ddeb50a81cbd57..1c20aaf02e2213547320b608e0fb86930515bc58 100644 --- a/~dev_rating/application/views/teacher/discipline/edit/settings.twig +++ b/~dev_rating/application/views/teacher/discipline/edit/settings.twig @@ -3,10 +3,10 @@ {% set step_1 = 'active' %} {% block discipline_media %} - {{ HTML.script('media/js/discipline/EditSettings.js')|raw }} - {{ HTML.style('media/less/select2.css')|raw }} - {{ HTML.style('media/less/teacher/discipline/CreateDiscipline.css')|raw }} - {{ HTML.script('media/js/select2.js')|raw }} + {{ HTML.script('static/js/discipline/editSettings.js')|raw }} + {{ HTML.style('static/css/select2.css')|raw }} + {{ HTML.style('static/css/teacher/discipline/CreateDiscipline.css')|raw }} + {{ HTML.script('static/js/libs/select2.js')|raw }} {% endblock %} {% block map_content %} diff --git a/~dev_rating/application/views/teacher/discipline/edit/structure.twig b/~dev_rating/application/views/teacher/discipline/edit/structure.twig index 52a0f0ff1495416e32eb80c6210eebb83d33c899..3d7da40b7773a9b91286d06a1a3d0e3da0cd9cc2 100644 --- a/~dev_rating/application/views/teacher/discipline/edit/structure.twig +++ b/~dev_rating/application/views/teacher/discipline/edit/structure.twig @@ -4,11 +4,11 @@ {% block discipline_media %} {% if Discipline.IsLocked != 1 %} - {{ HTML.script('media/js/discipline/EditStructure.js')|raw }} + {{ HTML.script('static/js/discipline/editStructure.js')|raw }} {% else %} - {{ HTML.script('media/js/discipline/EditStructureLocked.js')|raw }} + {{ HTML.script('static/js/discipline/editStructureLocked.js')|raw }} {% endif %} - {{ HTML.style('media/less/teacher/discipline/EditStructure.css')|raw }} + {{ HTML.style('static/css/teacher/discipline/editStructure.css')|raw }} {% endblock %} {% block map_content %} diff --git a/~dev_rating/application/views/teacher/discipline/edit/students.twig b/~dev_rating/application/views/teacher/discipline/edit/students.twig index 9d88ecc5c9c1e3bc47770db8374dec13f9ac36c0..e3275017ce37bb5aaff969a1c7d5655ba6e74613 100644 --- a/~dev_rating/application/views/teacher/discipline/edit/students.twig +++ b/~dev_rating/application/views/teacher/discipline/edit/students.twig @@ -3,8 +3,8 @@ {% set step_5 = 'active' %} {% block discipline_media %} - {{ HTML.script('media/js/discipline/EditStudents.js')|raw }} - {{ HTML.style('media/less/teacher/discipline/EditStudents.css')|raw }} + {{ HTML.script('static/js/discipline/editStudents.js')|raw }} + {{ HTML.style('static/css/teacher/discipline/EditStudents.css')|raw }} {% endblock %} {% macro outputStudent(Student) %} diff --git a/~dev_rating/application/views/teacher/discipline/edit/teachers.twig b/~dev_rating/application/views/teacher/discipline/edit/teachers.twig index 4edbdcd8e9b0c1fd676f1bc74d2208495c3f24c5..79fc5c2566e7441613fc1fdec8e95e76689841f9 100644 --- a/~dev_rating/application/views/teacher/discipline/edit/teachers.twig +++ b/~dev_rating/application/views/teacher/discipline/edit/teachers.twig @@ -3,8 +3,8 @@ {% set step_3 = 'active' %} {% block discipline_media %} - {{ HTML.script('media/js/discipline/EditTeachers.js')|raw }} - {{ HTML.style('media/less/teacher/discipline/EditTeachers.css')|raw }} + {{ HTML.script('static/js/discipline/editTeachers.js')|raw }} + {{ HTML.style('static/css/teacher/discipline/EditTeachers.css')|raw }} {% endblock %} {% block map_content %} diff --git a/~dev_rating/application/views/teacher/exam.twig b/~dev_rating/application/views/teacher/exam.twig index 0529aa67d9a2430c5016f82b3aa98d26aa1e1adb..697dad9fa513e9f3e98e9a27773d12c067d5a2e9 100644 --- a/~dev_rating/application/views/teacher/exam.twig +++ b/~dev_rating/application/views/teacher/exam.twig @@ -2,11 +2,11 @@ {% block title %}Сессия{% endblock %} {# head -> title #} {% block media %} {# head -> css, js #} - {{ HTML.script('media/js/rating.js')|raw }} - {{ HTML.script('media/js/functions.js')|raw }} - {{ HTML.script('media/js/jquery.fileDownload.js')|raw }} + {{ HTML.script('static/js/rating.js')|raw }} + {{ HTML.script('static/js/functions.js')|raw }} + {{ HTML.script('static/js/libs/jquery.fileDownload.js')|raw }} - {{ HTML.style('media/less/teacher/rating.css')|raw }} + {{ HTML.style('static/css/teacher/rating.css')|raw }} {% endblock %} {% block main_top_title %}Сессия{% endblock %} diff --git a/~dev_rating/application/views/teacher/index.twig b/~dev_rating/application/views/teacher/index.twig index b8d443a4ab0c87afc28886b819e2628dc550cb08..d1de4d91d9a909ebf8178b442a6563cd0da72d7b 100644 --- a/~dev_rating/application/views/teacher/index.twig +++ b/~dev_rating/application/views/teacher/index.twig @@ -2,9 +2,9 @@ {% block title %}Дисциплины{% endblock %} {# head -> title #} {% block media %} {# head -> css, js #} - {{ HTML.script('media/js/discipline/DisciplineList.js')|raw }} - {{ HTML.style('media/less/teacher/index.css')|raw }} - {{ HTML.style('media/less/common/buttons.css')|raw }} + {{ HTML.script('static/js/discipline/disciplineList.js')|raw }} + {{ HTML.style('static/css/teacher/index.css')|raw }} + {{ HTML.style('static/css/common/buttons.css')|raw }} {% endblock %} {% macro outputDiscipline(Discipline, Groups, Teachers) %} @@ -89,13 +89,13 @@ </div> </div> #} {{ base.action(URL.site('discipline/create/'), - URL.site('media/img/addList.png'), + URL.site('static/img/addList.png'), 'Создать РЅРѕРІСѓСЋ дисциплину', 'Добавить РІ систему '~System.Title~' дисциплину. '~ 'Ртот шаг включает РІ себя создание РЈРљР”, добавление преподавателей, присоединение РіСЂСѓРїРї Рё '~ 'выбор определенных студентов, которые Р±СѓРґСѓС‚ подписаны РЅР° дисциплину.') }} {{ base.action(URL.site('coursework/create/'), - URL.site('media/img/addList.png'), + URL.site('static/img/addList.png'), 'Создать РєСѓСЂСЃРѕРІСѓСЋ работу', 'Добавить РІ систему '~System.Title~' дисциплину типа курсовая научная работа '~ 'или курсовая работа РїРѕ дисциплине.') }} diff --git a/~dev_rating/application/views/teacher/javaAuth.twig b/~dev_rating/application/views/teacher/javaAuth.twig index ee2b6d93b27d5822591269110dfbd043249a1011..92106b850151529a5308346146f548ed4ffc3022 100644 --- a/~dev_rating/application/views/teacher/javaAuth.twig +++ b/~dev_rating/application/views/teacher/javaAuth.twig @@ -1,8 +1,8 @@ <html> <head> {% block media %} {# head -> css, js #} - {{ HTML.script('media/js/jquery-1.9.1.min.js')|raw }} - {{ HTML.script('media/js/javaAuth.js')|raw }} + {{ HTML.script('static/js/libs/jquery-1.9.1.min.js')|raw }} + {{ HTML.script('static/js/javaAuth.js')|raw }} {% endblock %} <script> $(document).ready(function() diff --git a/~dev_rating/application/views/teacher/rating.twig b/~dev_rating/application/views/teacher/rating.twig index e11315dd6bed21278eddc1313121aa969b68a113..d2d1d9926a025f840e07e2dd6948e9ab7fad30f7 100644 --- a/~dev_rating/application/views/teacher/rating.twig +++ b/~dev_rating/application/views/teacher/rating.twig @@ -2,11 +2,11 @@ {% block title %}Выставление баллов{% endblock %} {# head -> title #} {% block media %} {# head -> css, js #} - {{ HTML.script('media/js/functions.js')|raw }} - {{ HTML.script('media/js/jquery.fileDownload.js')|raw }} - {{ HTML.script('media/js/rating.js')|raw }} + {{ HTML.script('static/js/functions.js')|raw }} + {{ HTML.script('static/js/libs/jquery.fileDownload.js')|raw }} + {{ HTML.script('static/js/rating.js')|raw }} - {{ HTML.style('media/less/teacher/rating.css')|raw }} + {{ HTML.style('static/css/teacher/rating.css')|raw }} {% endblock %} {% block main_top_title %}Выставление баллов{% endblock %} diff --git a/~dev_rating/index.php b/~dev_rating/index.php index 0e5b82376e30c971eece0acd279cec0eab62baaf..8ef78b1b51111cb205d4ddc301921732ef01d1eb 100644 --- a/~dev_rating/index.php +++ b/~dev_rating/index.php @@ -23,12 +23,6 @@ $modules = 'modules'; */ $system = 'system'; -/** - * Директория, РІ которой содержатся конфиги, используемые РїСЂРё деплое. - * - * @link http://kohanaframework.org/guide/about.install#system - */ -$deployConfig = 'deployConfig'; /** * The default extension of resource files. If you change this, all resources @@ -76,18 +70,13 @@ if ( ! is_dir($modules) AND is_dir(DOCROOT.$modules)) if ( ! is_dir($system) AND is_dir(DOCROOT.$system)) $system = DOCROOT.$system; -// Make the configs relative to the docroot, for symlink'd index.php -if ( ! is_dir($deployConfig) AND is_dir(DOCROOT.$deployConfig)) - $deployConfig = DOCROOT.$deployConfig; - // Define the absolute paths for configured directories define('APPPATH', realpath($application).DIRECTORY_SEPARATOR); define('MODPATH', realpath($modules).DIRECTORY_SEPARATOR); define('SYSPATH', realpath($system).DIRECTORY_SEPARATOR); -define('CFGPATH', realpath($deployConfig).DIRECTORY_SEPARATOR); // Clean up the configuration vars -unset($application, $modules, $system, $deployConfig); +unset($application, $modules, $system); if (file_exists('install'.EXT)) { @@ -95,11 +84,6 @@ if (file_exists('install'.EXT)) return include 'install'.EXT; } -if (file_exists('deploy'.EXT)) -{ - // Load the deploy check - include 'deploy'.EXT; -} /** * Define the start time of the application, used for profiling. diff --git a/~dev_rating/media/less/admin/common.css b/~dev_rating/media/less/admin/common.css deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/~dev_rating/media/less/circles.css b/~dev_rating/media/less/circles.css deleted file mode 100644 index 8d98c80c89ea9c69070ab9433fe97065eda6e386..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/circles.css +++ /dev/null @@ -1,35 +0,0 @@ -.Circle { - display: inline-block; - padding: 15px 0; - min-width: 45px; - min-height: 45px; - border-radius: 50%; - vertical-align: middle; - color: #eef1f2; - text-align: center; -} -.Circle.Undefined { - background: #a0a3a3; -} -.Circle.ECTS-F { - background: #8a2e15; -} -.Circle.ECTS-FX { - background: #d46141; -} -.Circle.ECTS-E { - background: #edec51; - color: #212121; -} -.Circle.ECTS-D { - background: #7eba3c; -} -.Circle.ECTS-C { - background: #28ae57; -} -.Circle.ECTS-B { - background: #349920; -} -.Circle.ECTS-A { - background: #367f27; -} diff --git a/~dev_rating/media/less/common.css b/~dev_rating/media/less/common.css deleted file mode 100644 index db0106d4009ffe5cb6d12ea5c40c66c1b99f3128..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/common.css +++ /dev/null @@ -1,666 +0,0 @@ -/* http://meyerweb.com/eric/tools/css/reset/ - v2.0 | 20110126 - License: none (public domain) -*/ -*, -*:before, -*:after { - box-sizing: border-box; -} -html, -body, -div, -button, -span, -applet, -object, -iframe, -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -a, -abbr, -acronym, -address, -big, -cite, -code, -del, -dfn, -em, -img, -ins, -kbd, -q, -s, -samp, -small, -strike, -strong, -sub, -sup, -tt, -var, -b, -u, -i, -center, -dl, -dt, -dd, -ol, -ul, -li, -fieldset, -form, -label, -legend, -table, -caption, -tbody, -tfoot, -thead, -tr, -th, -td, -article, -aside, -canvas, -details, -embed, -figure, -figcaption, -footer, -header, -hgroup, -menu, -nav, -output, -ruby, -section, -summary, -time, -mark, -audio, -video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} -/* HTML5 display-role reset for older browsers */ -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -menu, -nav, -section, -main { - display: block; -} -body { - line-height: 1; -} -ol, -ul { - list-style: none; -} -blockquote, -q { - quotes: none; -} -blockquote:before, -blockquote:after, -q:before, -q:after { - content: ''; - content: none; -} -table { - border-collapse: collapse; - border-spacing: 0; -} -body { - background-color: #eef1f2; - font-family: 'PT Sans', sans-serif; - font-size: 1em; - color: #212121; - line-height: 1.1; - min-width: 1024px; - height: 100%; -} -.page { - width: 100%; -} -p { - text-align: justify; - margin-bottom: 10px; -} -b { - font-weight: bold; -} -a, -a:link { - font-size: 0.9em; - color: #0183ce; - text-decoration: none; -} -a:hover { - font-size: 0.9em; - color: #f0622e; -} -h1 { - font-size: 2em; -} -h2 { - font-size: 1.5em; -} -h2.Blue { - color: #004573; -} -h3 { - font-size: 1.2em; -} -input[type="checkbox"] { - /*для разных браузеров нужно задать размер чекбокса*/ - height: 13px; -} -.clearFix { - clear: both; -} -.clearFix .label { - float: left; - width: 200px; - color: #6d7070; -} -.clearFix .content { - overflow: hidden; -} -.goodClearFix:after { - content: '.'; - display: block; - height: 0; - clear: both; - visibility: hidden; -} -* html .goodClearFix { - height: 1%; -} -.goodClearFix { - display: block; -} -.Warning { - position: absolute; - padding: 6px 10px; - top: 0; - right: 0; - text-align: center; - font-size: 14px; - color: #a94442; - background: #f2dede; - border-radius: 0 0 0 5px; -} -.header_wrapper { - -webkit-box-shadow: 0 5px 5px #e1e2e2; - box-shadow: 0 5px 5px #e1e2e2; - font-size: 0.9em; - padding: 12px 20px; - background-color: #fbfeff; - overflow: hidden; -} -.header_wrapper > .alignLeft { - display: inline-block; -} -.header_wrapper a { - font-size: 0.9em; -} -.header_wrapper .logotype { - margin-right: 15px; -} -.header_wrapper .faculty { - color: #a0a3a3; -} -.header_wrapper .navigation { - color: #a0a3a3; - display: inline; - text-align: right; - float: right; -} -.header_wrapper .navigation > div { - display: inline-block; - margin: 0 5px; -} -.header_wrapper .navigation a { - margin-left: 5px; -} -.profile_wrapper { - width: 450px; - position: absolute; - z-index: 9999; - background-color: #fbfeff; - font-size: 0.9em; - padding: 5px; - right: 15px; - top: 45px; - -webkit-box-shadow: 0 0 5px #a0a3a3; - box-shadow: 0 0 5px #a0a3a3; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - -khtml-border-radius: 5px; -} -.profile_wrapper .clearFix { - padding: 5px; -} -.profile_wrapper .clearFix .label { - width: 130px; -} -.profile_wrapper .username { - font-weight: 600; -} -.profile_wrapper .profile_delimeter { - border-bottom: 1px solid #ccc; - padding-bottom: 10px; -} -.main_layer { - max-width: 70%; - width: auto; - min-width: 920px; - margin: 35px auto; -} -.main_layer .footer { - text-align: center; - color: #a0a3a3; -} -.main_layer .footer a { - color: #a0a3a3; -} -.main_layer .footer a:hover { - color: #6d7070; -} -.main { - margin-bottom: 10px; - border-radius: 5px; - background-color: #fbfeff; - -webkit-box-shadow: 0 0 5px #a0a3a3; - box-shadow: 0 0 5px #a0a3a3; -} -.main .main_top { - display: inline-block; - position: absolute; - background-color: #0183ce; - color: #eef1f2; - font-size: 1.1em; - margin: -15px 0px 0px -10px; - padding: 0.45em 2.5em 0.45em 1.5em; - min-width: 15%; -} -.main .main_content { - width: 100%; - font-size: 0.95em; - position: relative; - padding-top: 35px; - padding-bottom: 25px; -} -.sidePadding { - padding: 0 25px; -} -.semesterMargin { - margin-top: 12.5px; - margin-bottom: 5px; - overflow: hidden; -} -.semesterLayer { - display: inline-block; - width: 70%; -} -.semesterLayer .semesterName, -.semesterLayer .semesterSwitcherBtn { - display: inline-block; - vertical-align: middle; -} -.semesterLayer .semesterSwitcher { - display: block; - padding: 10px; - overflow: hidden; - width: auto; - position: absolute; - z-index: 9999; - margin-top: 5px; - background: #fbfeff; - border: 1px solid #eef1f2; - -webkit-box-shadow: 0 0 5px #a0a3a3; - box-shadow: 0 0 5px #a0a3a3; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - -khtml-border-radius: 5px; -} -.semesterLayer .semesterSwitcher li { - padding: 5px; -} -.helpLink { - width: 29%; - display: inline-block; - text-align: right; -} -.comment { - font-size: 0.7em; - font-style: italic; - width: 90%; - display: inline-block; - text-align: left; -} -/*---------------- модальное РѕРєРЅРѕ -------------------*/ -.session_info { - font: 9pt; - color: #aaaaaa; -} -.auth_form { - padding: 3px; - margin: 0 auto; - text-align: center; -} -.auth_form input { - margin: 0 auto; - margin: 1px 0; - border: 1px solid; - border-radius: 3px; -} -.auth_form input[type=text], -.auth_form input[type=password] { - font-size: 9pt; - width: 90%; - border-color: #aaaaaa; - overflow: hidden; - padding: 7px; -} -.auth_form input[type=button], -.auth_form input[type=submit] { - margin: 0 auto; - width: 95%; - overflow: hidden; - padding: 7px; - background-color: #009933; - border: none; - color: #ffffff; -} -.auth_form input[type=button]:hover, -.auth_form input[type=submit]:hover { - cursor: pointer; - background-color: #009000; -} -.popup_overlay { - z-index: 9999; - display: none; - position: fixed; - left: 0; - top: 0; - width: 100%; - height: 100%; - background: rgba(0, 0, 0, 0.7); - text-align: center; -} -.popup_overlay:after { - display: inline-block; - height: 100%; - width: 0; - vertical-align: middle; - content: ''; -} -.popup { - display: inline-block; - position: relative; - max-width: 300px; - padding: 20px; - border: 3px solid #fff; - border-radius: 10px; - box-shadow: inset 0 1px 2px 1px rgba(0, 0, 0, 0.4); - background: #fff; - vertical-align: middle; -} -.inputs { - margin: 0 auto; - margin-top: 5px; -} -.actiongrid { - margin-top: 5px; -} -.popup_overlay:target > div { - -webkit-animation-name: bounce; -} -@-webkit-keyframes bounce { - 0% { - -webkit-transform: scale3d(0.1, 0.1, 1); - -webkit-box-shadow: 0 3px 20px rgba(0, 0, 0, 0.9); - } - 55% { - -webkit-transform: scale3d(1.08, 1.08, 1); - -webkit-box-shadow: 0 10px 20px rgba(0, 0, 0, 0); - } - 75% { - -webkit-transform: scale3d(0.95, 0.95, 1); - -webkit-box-shadow: 0 0 20px rgba(0, 0, 0, 0.9); - } - 100% { - -webkit-transform: scale3d(1, 1, 1); - -webkit-box-shadow: 0 3px 20px rgba(0, 0, 0, 0.9); - } -} -.defaultForm.FullWidth { - width: 100%; -} -.defaultForm.HalfWidth { - width: 50%; -} -.defaultForm.P1Width { - width: 80.5% !important; - margin-right: 0.5%; -} -.defaultForm.P2Width { - width: 18.5% !important; -} -.defaultForm.marginBetween { - margin-bottom: 5px; -} -input[type=text].defaultForm, -input[type=password].defaultForm, -textarea.defaultForm { - padding: 7px; - border-radius: 3px; - border: 1px solid #a0a3a3; - width: 100%; -} -textarea.defaultForm { - font-family: 'PT Sans', sans-serif; - font-size: 0.9em; -} -input[type=button].defaultForm, -button.defaultForm { - display: inline-block; - cursor: pointer; - padding: 7px 0; - min-width: 80px; - margin: 5px auto; - border-radius: 5px; - border: 0; -} -input[type=button].defaultForm.GreenButton, -button.defaultForm.GreenButton { - background: #009933; - color: #fbfeff; -} -input[type=button].defaultForm.GreenButton:hover, -button.defaultForm.GreenButton:hover { - background: #009e35; -} -input[type=button].defaultForm.BlueButton, -button.defaultForm.BlueButton { - background: #0183ce; - color: #fbfeff; -} -input[type=button].defaultForm.BlueButton:hover, -button.defaultForm.BlueButton:hover { - background: #018ddd; -} -input[type=button].defaultForm[disabled=disabled], -button.defaultForm[disabled=disabled] { - background: #6d7070; - color: #eef1f2; -} -input[type=button].defaultForm[disabled=disabled]:hover, -button.defaultForm[disabled=disabled]:hover { - background: #797d7d; - /*#3A84A6;*/ - color: #eef1f2; -} -select.defaultForm { - padding: 7px; - font-size: 0.85em; - border-radius: 2px; - border: 1px solid #a0a3a3; - width: 100%; -} -#errButton { - position: fixed; - z-index: 300; - top: 300px; - left: 0; - width: 35px; - height: 73px; - text-align: center; - background-color: #3a84a6; - /*#6DAD53;*/ - -webkit-border-radius: 0 5px 5px 0; - -moz-border-radius: 0 5px 5px 0; - border-radius: 0 5px 5px 0; -} -#errButton:hover { - background-color: #3399cc; - cursor: pointer; -} -#errButton:active { - border: 1px inset #3399cc; -} -#errButton_img { - width: 12px; - height: 72px; - margin: 0 auto; - background-image: url(../img/icons/feedback.png); - background-repeat: no-repeat; -} -#message { - height: 300px; - resize: vertical; -} -.EventInspectorList { - position: fixed; - height: auto; - min-width: 200px; - width: 15%; - top: 50px; - right: 20px; -} -.EventInspectorList .EventItem { - width: auto; - padding: 10px 15px; - margin-bottom: 10px; - border-radius: 4px; - font-size: 0.8em; - z-index: 500; -} -.EventInspectorList .success { - color: #3c763d; - background-color: #dff0d8; - border: 1px solid #d6e9c6; -} -.EventInspectorList .success:hover { - border-color: #80d570; -} -.EventInspectorList .error { - color: #a94442; - background-color: #f2dede; - border: 1px solid #ebccd1; -} -.EventInspectorList .error:hover { - border-color: #e09595; -} -.window { - display: none; - position: absolute; - top: 0; - left: 0; - z-index: 1000; - width: 100%; - height: 100%; - background-color: rgba(0, 0, 0, 0.3); -} -.window-shadow { - position: absolute; - width: 100%; - height: 100%; -} -.window-block { - position: relative; - z-index: 1; - margin: 29px auto 19px; - background-color: #fbfeff; - border: 1px solid #e4e4e4; - border-radius: 3px; -} -.window-title { - position: absolute; - background-color: #0183ce; - color: #eef1f2; - font-size: 1.15em; - margin: -15px 0px 0px -10px; - padding: 0.55em 2.5em 0.55em 1.5em; - min-width: 20%; -} -.window-close { - position: absolute; - top: 3px; - right: 3px; - display: block; - width: 20px; - height: 20px; - background: url("../img/close.png") center; -} -.window-content { - padding: 30px 15px 10px; - overflow: hidden; -} -.window-content p { - margin-bottom: 5px; - line-height: 16px; - font-size: 14px; -} -.window-content h1 { - margin-bottom: 5px; - padding-top: 5px; - line-height: 16px; - font-size: 15px; -} -.window-content table { - margin-bottom: 5px; - border-collapse: collapse; -} -.window-content td { - padding: 0 10px; - line-height: 20px; - font-size: 14px; - border: 1px solid black; -} diff --git a/~dev_rating/media/less/common/buttons.css b/~dev_rating/media/less/common/buttons.css deleted file mode 100644 index 6f2e4ab261ab94f2484170d93b230df6388bc9de..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/common/buttons.css +++ /dev/null @@ -1,80 +0,0 @@ -.placeholder { - color: #aaa; -} -/* --- РљРЅРѕРїРєРё ---*/ -button.global_button { - padding: 6px 25px; - text-align: center; - border: 0; - font-weight: 400; - color: #eef1f2; - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - -khtml-border-radius: 3px; -} -button.global_button:hover { - cursor: pointer; -} -button.global_button.blue { - background: #3A84A6; -} -button.global_button.blue:hover { - background: #04a2fe; -} -button.global_button.green { - background: #009933; -} -button.global_button.green:hover { - background: #00a336; -} -button.global_button.grey { - border: 1px solid #d4d5d5; - background: #fbfeff; - color: #212121; -} -button.global_button.grey:hover { - background: #f9f9f9; -} -.action { - background-color: #fbfeff; - border: 1px solid #eef1f2; - margin: 2px 0; - padding: 10px; - text-decoration: none; - display: block; -} -.action_bar { - margin-top: 10px; -} -.action_link { - text-decoration: none; -} -.action_link:hover { - text-decoration: none; -} -.action:hover { - background-color: #eef1f2; - text-decoration: none; -} -.action > div { - display: inline-block; - vertical-align: middle; - text-decoration: none; -} -.action_content { - width: 90%; - margin-left: 5px; - text-decoration: none; -} -.action_title { - font-size: 1.8em; - margin-bottom: 10px; - color: #0183ce; - text-decoration: none; -} -.action_description { - font-size: 1em; - color: #6d7070; - text-decoration: none; -} diff --git a/~dev_rating/media/less/common/forms.css b/~dev_rating/media/less/common/forms.css deleted file mode 100644 index b4b2251b5b7a730a43fb7de36384796a40eaaa89..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/common/forms.css +++ /dev/null @@ -1,74 +0,0 @@ -.defaultForm.FullWidth { - width: 100%; -} -.defaultForm.HalfWidth { - width: 50%; -} -.defaultForm.P1Width { - width: 80.5% !important; - margin-right: 0.5%; -} -.defaultForm.P2Width { - width: 18.5% !important; -} -.defaultForm.marginBetween { - margin-bottom: 5px; -} -input[type=text].defaultForm, -input[type=password].defaultForm, -textarea.defaultForm { - padding: 7px; - border-radius: 3px; - border: 1px solid #a0a3a3; - width: 100%; -} -textarea.defaultForm { - font-family: 'PT Sans', sans-serif; - font-size: 0.9em; -} -input[type=button].defaultForm, -button.defaultForm { - display: inline-block; - cursor: pointer; - padding: 7px 0; - min-width: 80px; - margin: 5px auto; - border-radius: 5px; - border: 0; -} -input[type=button].defaultForm.GreenButton, -button.defaultForm.GreenButton { - background: #009933; - color: #fbfeff; -} -input[type=button].defaultForm.GreenButton:hover, -button.defaultForm.GreenButton:hover { - background: #009e35; -} -input[type=button].defaultForm.BlueButton, -button.defaultForm.BlueButton { - background: #0183ce; - color: #fbfeff; -} -input[type=button].defaultForm.BlueButton:hover, -button.defaultForm.BlueButton:hover { - background: #018ddd; -} -input[type=button].defaultForm[disabled=disabled], -button.defaultForm[disabled=disabled] { - background: #6d7070; - color: #eef1f2; -} -input[type=button].defaultForm[disabled=disabled]:hover, -button.defaultForm[disabled=disabled]:hover { - background: #797d7d; - /*#3A84A6;*/ - color: #eef1f2; -} -select.defaultForm { - padding: 7px; - font-size: 0.85em; - border-radius: 2px; - border: 1px solid #a0a3a3; - width: 100%; -} diff --git a/~dev_rating/media/less/common/tabs.css b/~dev_rating/media/less/common/tabs.css deleted file mode 100644 index 6352363360a7e78bc81843e8b08da0f56bb65ab7..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/common/tabs.css +++ /dev/null @@ -1,47 +0,0 @@ -.tabsWrapper { - margin: 5px auto; - width: 95%; -} -.tabsWrapper .tabs { - display: table; - width: 100%; - margin: 0; - padding: 0; -} -.tabsWrapper .tabs .tab { - display: table-cell; - width: 20%; - float: none; - text-align: center; - border-left: 3px solid #fff; -} -.tabsWrapper .tabs .tab a { - display: block; - padding-top: 5px; - padding-bottom: 5px; - background: #eef1f2; - font-size: 13px; - color: #0183ce; -} -.tabsWrapper .tabs .tab a:hover { - background-color: #04a2fe; - color: #eef1f2; - text-decoration: none; -} -.tabsWrapper .tabs .tab a.inactive { - background-color: #eef1f2; - color: #6d7070; -} -.tabsWrapper .tabs .tab a.inactive:hover { - background-color: #eef1f2; - color: #6d7070; - cursor: help; -} -.tabsWrapper .tabs .tab a.active { - background-color: #04a2fe; - color: #eef1f2; - text-decoration: none; -} -.tabsWrapper .tab:first-child { - margin-left: 0px; -} diff --git a/~dev_rating/media/less/dean_office/dean.css b/~dev_rating/media/less/dean_office/dean.css deleted file mode 100644 index d0e59c87cf2c0b86ad01dd74f7e6f4abdd2be29c..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/dean_office/dean.css +++ /dev/null @@ -1,21 +0,0 @@ -.sidePanel { - float: left; -} -.sidePanel div { - width: 235px; - padding: 5px 0; - height: 30px; -} -.deanContent { - border-left: 1px solid #e4e4e4; - display: block; - overflow: hidden; - margin-left: 240px; - padding-left: 10px; -} -.SelectDiscipline { - width: 100%; -} -.infoBox { - margin-top: 10px; -} diff --git a/~dev_rating/media/less/js/event_inspector.css b/~dev_rating/media/less/js/event_inspector.css deleted file mode 100644 index 68d91f1fa8a502bf22fae477b3c086d422870097..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/js/event_inspector.css +++ /dev/null @@ -1,32 +0,0 @@ -.EventInspectorList { - position: fixed; - height: auto; - min-width: 200px; - width: 15%; - top: 50px; - right: 20px; -} -.EventInspectorList .EventItem { - width: auto; - padding: 10px 15px; - margin-bottom: 10px; - border-radius: 4px; - font-size: 0.8em; - z-index: 500; -} -.EventInspectorList .success { - color: #3c763d; - background-color: #dff0d8; - border: 1px solid #d6e9c6; -} -.EventInspectorList .success:hover { - border-color: #80d570; -} -.EventInspectorList .error { - color: #a94442; - background-color: #f2dede; - border: 1px solid #ebccd1; -} -.EventInspectorList .error:hover { - border-color: #e09595; -} diff --git a/~dev_rating/media/less/js/wnd.css b/~dev_rating/media/less/js/wnd.css deleted file mode 100644 index caa56dc15df4a435bc66ba7bae58d502b9a0b759..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/js/wnd.css +++ /dev/null @@ -1,66 +0,0 @@ -.window { - display: none; - position: absolute; - top: 0; - left: 0; - z-index: 1000; - width: 100%; - height: 100%; - background-color: rgba(0, 0, 0, 0.3); -} -.window-shadow { - position: absolute; - width: 100%; - height: 100%; -} -.window-block { - position: relative; - z-index: 1; - margin: 29px auto 19px; - background-color: #fbfeff; - border: 1px solid #e4e4e4; - border-radius: 3px; -} -.window-title { - position: absolute; - background-color: #0183ce; - color: #eef1f2; - font-size: 1.15em; - margin: -15px 0px 0px -10px; - padding: 0.55em 2.5em 0.55em 1.5em; - min-width: 20%; -} -.window-close { - position: absolute; - top: 3px; - right: 3px; - display: block; - width: 20px; - height: 20px; - background: url("../img/close.png") center; -} -.window-content { - padding: 30px 15px 10px; - overflow: hidden; -} -.window-content p { - margin-bottom: 5px; - line-height: 16px; - font-size: 14px; -} -.window-content h1 { - margin-bottom: 5px; - padding-top: 5px; - line-height: 16px; - font-size: 15px; -} -.window-content table { - margin-bottom: 5px; - border-collapse: collapse; -} -.window-content td { - padding: 0 10px; - line-height: 20px; - font-size: 14px; - border: 1px solid black; -} diff --git a/~dev_rating/media/less/modal.css b/~dev_rating/media/less/modal.css deleted file mode 100644 index 20ae0fd654f54d66274080604a25f2ef80df218a..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/modal.css +++ /dev/null @@ -1,96 +0,0 @@ -/*---------------- модальное РѕРєРЅРѕ -------------------*/ -.session_info { - font: 9pt; - color: #aaaaaa; -} -.auth_form { - padding: 3px; - margin: 0 auto; - text-align: center; -} -.auth_form input { - margin: 0 auto; - margin: 1px 0; - border: 1px solid; - border-radius: 3px; -} -.auth_form input[type=text], -.auth_form input[type=password] { - font-size: 9pt; - width: 90%; - border-color: #aaaaaa; - overflow: hidden; - padding: 7px; -} -.auth_form input[type=button], -.auth_form input[type=submit] { - margin: 0 auto; - width: 95%; - overflow: hidden; - padding: 7px; - background-color: #009933; - border: none; - color: #ffffff; -} -.auth_form input[type=button]:hover, -.auth_form input[type=submit]:hover { - cursor: pointer; - background-color: #009000; -} -.popup_overlay { - z-index: 9999; - display: none; - position: fixed; - left: 0; - top: 0; - width: 100%; - height: 100%; - background: rgba(0, 0, 0, 0.7); - text-align: center; -} -.popup_overlay:after { - display: inline-block; - height: 100%; - width: 0; - vertical-align: middle; - content: ''; -} -.popup { - display: inline-block; - position: relative; - max-width: 300px; - padding: 20px; - border: 3px solid #fff; - border-radius: 10px; - box-shadow: inset 0 1px 2px 1px rgba(0, 0, 0, 0.4); - background: #fff; - vertical-align: middle; -} -.inputs { - margin: 0 auto; - margin-top: 5px; -} -.actiongrid { - margin-top: 5px; -} -.popup_overlay:target > div { - -webkit-animation-name: bounce; -} -@-webkit-keyframes bounce { - 0% { - -webkit-transform: scale3d(0.1, 0.1, 1); - -webkit-box-shadow: 0 3px 20px rgba(0, 0, 0, 0.9); - } - 55% { - -webkit-transform: scale3d(1.08, 1.08, 1); - -webkit-box-shadow: 0 10px 20px rgba(0, 0, 0, 0); - } - 75% { - -webkit-transform: scale3d(0.95, 0.95, 1); - -webkit-box-shadow: 0 0 20px rgba(0, 0, 0, 0.9); - } - 100% { - -webkit-transform: scale3d(1, 1, 1); - -webkit-box-shadow: 0 3px 20px rgba(0, 0, 0, 0.9); - } -} diff --git a/~dev_rating/media/less/reset.css b/~dev_rating/media/less/reset.css deleted file mode 100644 index 852a14585a03ac7966e9d4a33a330ba4615ce65d..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/reset.css +++ /dev/null @@ -1,135 +0,0 @@ -/* http://meyerweb.com/eric/tools/css/reset/ - v2.0 | 20110126 - License: none (public domain) -*/ -*, -*:before, -*:after { - box-sizing: border-box; -} -html, -body, -div, -button, -span, -applet, -object, -iframe, -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -a, -abbr, -acronym, -address, -big, -cite, -code, -del, -dfn, -em, -img, -ins, -kbd, -q, -s, -samp, -small, -strike, -strong, -sub, -sup, -tt, -var, -b, -u, -i, -center, -dl, -dt, -dd, -ol, -ul, -li, -fieldset, -form, -label, -legend, -table, -caption, -tbody, -tfoot, -thead, -tr, -th, -td, -article, -aside, -canvas, -details, -embed, -figure, -figcaption, -footer, -header, -hgroup, -menu, -nav, -output, -ruby, -section, -summary, -time, -mark, -audio, -video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} -/* HTML5 display-role reset for older browsers */ -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -menu, -nav, -section, -main { - display: block; -} -body { - line-height: 1; -} -ol, -ul { - list-style: none; -} -blockquote, -q { - quotes: none; -} -blockquote:before, -blockquote:after, -q:before, -q:after { - content: ''; - content: none; -} -table { - border-collapse: collapse; - border-spacing: 0; -} diff --git a/~dev_rating/media/less/sign/sign.css b/~dev_rating/media/less/sign/sign.css deleted file mode 100644 index c5560c6fda8daeac233717b3482dc2b43516ac10..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/sign/sign.css +++ /dev/null @@ -1,50 +0,0 @@ -.main_layer { - max-width: 850px; - min-width: 320px; - width: 100%; -} -.main_layer .main_content { - padding: 0; -} -h2 { - text-align: center; - margin: 5px auto; - margin-bottom: 15px; - padding: 5px; - color: #fbfeff; - background: #0183ce; -} -.Updates, -.AuthForm { - padding: 15px; - width: 50%; - margin: 0 auto; - height: 100%; - vertical-align: top; - display: inline-block; -} -.AuthForm { - float: right; -} -.tips { - padding: 5px; - font-size: 0.9em; - text-align: justify; - border: 1px solid #d4d5d5; - background: #eef1f2; - margin-bottom: 5px; -} -.Updates ol { - margin-top: 10px; -} -.Updates ol li { - list-style-type: decimal; - margin: 10px 0; - margin-left: 20px; -} -.Updates ol li:first-child { - margin-top: 0; -} -.Updates ol li:last-child { - margin-bottom: 0; -} diff --git a/~dev_rating/media/less/student/index.css b/~dev_rating/media/less/student/index.css deleted file mode 100644 index 64f0079c2565a1edfb36002a27382ed2c6d9a7d8..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/student/index.css +++ /dev/null @@ -1,45 +0,0 @@ -.disciplinesList { - width: 100%; - margin: 10px 0; -} -.disciplinesList td { - padding: 5px 0; - text-align: center; - vertical-align: middle; - border-top: 1px solid #e0e5e7; - border-bottom: 1px solid #e0e5e7; -} -.disciplinesList .tableHeader { - background-color: #eef1f2; -} -.disciplinesList .discProgress { - text-align: left; - width: 50px; -} -.disciplinesList .discTitle { - text-align: left; - max-width: 40%; - padding: 5px 10px; -} -.disciplinesList .disciplineRow > .discTitle { - font-size: 1.35em; -} -.disciplinesList .discTeachers { - font-size: 1.0em; - line-height: 1.2; -} -.disciplinesList .discRating > span { - cursor: help; -} -.helpWindow .ECTSGrades { - margin: 20px auto; -} -.helpWindow .ECTSGrades li { - display: inline-block; - width: 13.33333333%; - text-align: center; -} -.helpWindow .Description { - font-size: 0.8em; - padding: 5px; -} diff --git a/~dev_rating/media/less/student/subject.css b/~dev_rating/media/less/student/subject.css deleted file mode 100644 index 0710d1654005731fb6e0c692f9a6f3b112c9c711..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/student/subject.css +++ /dev/null @@ -1,76 +0,0 @@ -h3.blockTitle { - font-size: 1.4em; - border-bottom: 1px solid #d4d5d5; -} -.blockMargin { - margin: 15px 0; -} -.disciplineInfo { - line-height: 1.2; -} -.disciplineInfo.first { - margin-top: 15px; - margin-bottom: 7.5px; -} -.disciplineInfo.last { - margin-top: 7.5px; - margin-bottom: 15px; -} -.tableTitle { - padding: 5px; - text-align: center; - color: #eef1f2; - margin-top: 10px; -} -.tableTitle.Module { - background-color: #0183ce; -} -.tableTitle.Extra { - background-color: #009933; -} -.submoduleBlock { - padding: 5px; - border-bottom: 1px solid #d4d5d5; -} -.submoduleBlock > div { - display: inline-block; - vertical-align: middle; -} -.submoduleBlock .submoduleTitle { - width: 64%; - color: #212121; -} -.submoduleBlock .submoduleRate { - width: 10%; - text-align: center; -} -.submoduleBlock .submodulePercent { - width: 6%; - text-align: center; -} -.submoduleBlock .submoduleDate { - width: 18%; - text-align: center; - color: #6d7070; -} -.submoduleBlock.topBorder { - border-top: 1px solid #d4d5d5; -} -.submoduleBlock:hover { - background: #eef1f2; -} -.moduleResult { - padding: 5px; - border-bottom: 1px solid #d4d5d5; - text-align: center; - background: #eef1f2; - font-weight: 600; -} -.totalRate { - margin: 10px 0; - padding: 10px; - font-weight: 600; - background: #004573; - color: #eef1f2; - text-align: center; -} diff --git a/~dev_rating/media/less/teacher/discipline/CreateDiscipline.css b/~dev_rating/media/less/teacher/discipline/CreateDiscipline.css deleted file mode 100644 index 6c5e66d4097df3b0357b9e1c7df17cedd0d59297..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/teacher/discipline/CreateDiscipline.css +++ /dev/null @@ -1,41 +0,0 @@ -/* Базовые настройки дисциплины */ -.LayerSection { - margin: 0 auto; - margin-bottom: 10px; - width: 500px; - overflow: hidden; -} -.LayerSection select { - width: 100%; -} -.LayerSection .InputSubject { - width: 100%; -} -.LayerSection .SelectSubject { - width: 300px; -} -/* Подсказка */ -.LayerSection .help { - margin: 10px 0; - text-align: center; - color: #666666; -} -.LayerSection .itemBlock { - margin: 15px 0px; -} -.LayerSection .itemBlock .title { - float: left; - padding-top: 4px; - width: 200px; - color: #555; -} -.LayerSection .itemBlock .field { - display: inline-block; - width: 300px; -} -.AddDiscipline { - margin-left: 200px; -} -.ChangeDiscipline { - margin-left: 200px; -} diff --git a/~dev_rating/media/less/teacher/discipline/EditGroups.css b/~dev_rating/media/less/teacher/discipline/EditGroups.css deleted file mode 100644 index 07485da2903aafb9b61daedeb8a2e5c41a0dd14b..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/teacher/discipline/EditGroups.css +++ /dev/null @@ -1,34 +0,0 @@ -.ChangeStudyGroupDIV { - margin: 10px 4px 5px 6px; - padding: 10px; - background: #f4f4f4; - overflow: hidden; -} -.AttachedGroupsList { - margin: 20px 4px 0px 2px; - padding: 0 4px; - overflow: hidden; -} -.AttachedGroupsList .AttachedGroup { - margin: 10px 0; - padding: 7px 10px; - overflow: hidden; - background: #EDF1F5; - box-shadow: 2px 2px 2px #DDE8F0; -} -.AttachedGroupsList .AttachedGroup .StudyGroupInfo { - float: left; - color: #363636; -} -.AttachedGroupsList .AttachedGroup .UnbindGroup { - float: right; - font-weight: bold; - color: #FF0000; - background: transparent; - border-bottom: 1px solid transparent; - cursor: pointer; -} -.AttachedGroupsList .AttachedGroup .UnbindGroup:hover { - cursor: pointer; - border-bottom: 1px solid #FF0000; -} diff --git a/~dev_rating/media/less/teacher/discipline/EditStructure.css b/~dev_rating/media/less/teacher/discipline/EditStructure.css deleted file mode 100644 index 9d48e5acb85baf8b71debaef72de4357c32ca993..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/teacher/discipline/EditStructure.css +++ /dev/null @@ -1,180 +0,0 @@ -.studyMap { - background: #f1f1f1; - padding: 6px 20px; - margin: 0 6px 0 8px; - color: #333; -} -.moduleList { - padding: 0 4px; -} -.empty { - width: 100%; - margin: 50px 0; -} -.moduleGroup { - padding: 5px 4px 15px 4px; -} -.rateIndicatorDIV { - margin: 20px 0 25px 0; - text-align: center; -} -.StructureTable { - color: #363636; - overflow: hidden; -} -.StructureTable div { - overflow: hidden; - vertical-align: middle; -} -.StructureTable .name { - width: 300px; - text-align: center; - display: inline-block; - margin-right: 60px; -} -.StructureTable .currentControl { - width: 150px; - text-align: center; - display: inline-block; - margin-right: 20px; -} -.StructureTable .landmarkControl { - width: 150px; - text-align: center; - display: inline-block; -} -.StructureTable .actions { - float: right; - width: 110px; - display: inline-block; -} -.StructureTable .actions .icon { - float: right; - display: inline-block; - width: 20px; - height: 20px; - margin-left: 15px; - cursor: pointer; -} -.StructureTable .actions .up { - background: url("../../../img/icons/up.png") no-repeat center center; -} -.StructureTable .actions .down { - background: url("../../../img/icons/down.png") no-repeat center center; -} -.StructureTable .actions .delete { - background: url("../../../img/icons/delete.png") no-repeat center center; -} -.confirmDeleteDiv { - width: 160px; - overflow: hidden; - float: right; - display: inline-block; - text-align: right; -} -.confirmDeleteDiv .confirmDeleteModule { - margin-left: 10px; - cursor: pointer; - background: transparent; - font-weight: bold; - color: #00CC00; -} -.confirmDeleteDiv .cancel { - margin-left: 10px; - cursor: pointer; - background: transparent; - font-weight: bold; - color: #ff0000; -} -.confirmDeleteSubmodule { - margin-left: 10px; - cursor: pointer; - background: transparent; - font-weight: bold; - color: #00cc00; -} -.inputName { - border: 0; - width: 280px; - padding: 2px 10px; -} -.inputCredit { - border: 0; - width: 35px; - padding: 2px 5px; - text-align: center; -} -/* КОНЕЦ Общие... */ -/* Модуль */ -.moduleHead { - background-color: #cde8fd; - padding: 6px 23px; - margin-bottom: 3px; - box-shadow: 2px 2px 2px #9cd1fb; -} -/* РЎРїРёСЃРѕРє мероприятий (подмодулей) */ -/* Мероприятие (Подмодуль) */ -.submodule { - background-color: #e4e4e4; - padding: 6px 15px; - margin: 5px 8px 8px 8px; - box-shadow: 2px 2px 2px #d4d5d5; -} -/* Ркзамен */ -.ExamModule { - background-color: #f3ece3; - margin: 5px 4px 15px 4px; - padding: 6px 23px; - box-shadow: 2px 2px 2px #e4d4bf; -} -.ExamModule .name { - text-align: left; - color: #363636; -} -/* Бонус */ -.BonusModule { - background-color: #f3ece3; - margin: 5px 4px 15px 4px; - padding: 6px 23px; - box-shadow: 2px 2px 2px #e4d4bf; -} -.BonusModule .name { - text-align: left; - color: #363636; -} -/* РљРЅРѕРїРєР° добавления модуля */ -.addModule { - width: 100%; - background-color: #CDE8FD; - padding: 8px 10px; - text-align: center; - cursor: pointer; - font-weight: bold; - outline: none; - box-shadow: 2px 2px 2px #BDD3E5; -} -.addModule:hover { - background-color: #C2E4FF; -} -.addModule:active { - padding: 9px 9px 7px 11px; -} -/* РљРЅРѕРїРєР° добавления мероприятия */ -.addSubmodule { - float: right; - background: url("../../../img/icons/add.png") no-repeat 10px center #e4e4e4; - padding: 8px 20px 8px 40px; - margin: 0 8px; - border: 0; - cursor: pointer; - color: #009933; - font-weight: bold; - outline: none; - box-shadow: 2px 2px 2px #d4d5d5; -} -.addSubmodule:hover { - background-color: #dcdddd; -} -.addSubmodule:active { - padding: 9px 19px 7px 41px; -} diff --git a/~dev_rating/media/less/teacher/discipline/EditStudents.css b/~dev_rating/media/less/teacher/discipline/EditStudents.css deleted file mode 100644 index f608412dfb941faf25ff0738166da9486a959377..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/teacher/discipline/EditStudents.css +++ /dev/null @@ -1,166 +0,0 @@ -/* Прикрипление студентов */ -.StudentsList { - margin: 10px 5px 0px 6px; - overflow: hidden; -} -.StudentsList .AttachedStudentsList { - margin-top: 20px; - overflow: hidden; -} -.StudentsList .GradeAndGroupTitle { - background: #f1f1f1; - overflow: hidden; - padding: 5px 10px; - margin-top: 15px; - color: #333; -} -.GradeAndGroupTitle .info { - float: left; -} -.GradeAndGroupTitle .Action { - float: right; - cursor: pointer; -} -.StudentsList .GroupContainer { - display: none; - overflow: hidden; - padding-right: 4px; - padding-bottom: 4px; -} -.StudentsList .GroupContainer .hideListAction { - float: left; - background: url("../../../img/icons/triangle_up.png") no-repeat center center #f9f9f9; - width: 5%; - height: 100%; - margin-top: 10px; -} -.StudentsList .GroupContainer .hideListAction:hover { - background-color: #e1e1e1; -} -.StudentsList .GroupContainerAttached { - overflow: hidden; - padding-right: 4px; - padding-bottom: 4px; -} -.StudentsList .GroupContainerAttached .groupInfo { - float: left; - background: #f9f9f9; - width: 40px; - margin-top: 10px; - text-align: center; -} -.groupInfoAlone { - text-align: center; - margin: 7px auto; - border-radius: 3px 0 0 3px; - color: #0183ce; -} -.searchBtn { - display: inline-block; -} -.StudentsList .Student { - float: right; - width: 90%; - margin-top: 10px; - padding: 7px 10px; - box-shadow: 2px 2px 2px #DDE8F0; -} -.StudentsList .GroupContainerAttached .Student { - float: right; - /*width: 880px;*/ - margin-top: 10px; - padding: 7px 10px; -} -.StudentsList .Student .Name { - float: left; - color: #363636; -} -.StudentsList .Student .From { - float: left; - margin-left: 10px; - color: #363636; -} -.StudentsList .Student .action { - float: right; - cursor: pointer; -} -.StudentsList .StatusBind { - background: #EDF1F5; -} -.StudentsList .StatusUnbind { - background: #FDEFE9; - box-shadow: 2px 2px 2px #ECDDDD; -} -.StudentsList .Student .action { - font-weight: bold; -} -.StudentsList .Student .Action_UnbindStudent { - color: #FF0000; - background: transparent; - border-bottom: 1px solid transparent; -} -.StudentsList .Student .Action_UnbindStudent:hover { - cursor: pointer; - border-bottom: 1px solid #FF0000; -} -.StudentsList .Student .Action_BindStudent { - color: #009933; - background: transparent; - border-bottom: 1px solid transparent; -} -.StudentsList .Student .Action_BindStudent:hover { - cursor: pointer; - border-bottom: 1px solid #009933; -} -.StudentsList .Student .Action_BindStudentFromSearch { - color: #009933; - background: transparent; - border-bottom: 1px solid transparent; -} -.StudentsList .Student .Action_BindStudentFromSearch:hover { - cursor: pointer; - border-bottom: 1px solid #009933; -} -.btn_editStudents { - border: 0; - padding: 6px 20px; - font-weight: bold; - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - -khtml-border-radius: 3px; - display: inline-block; - margin-top: 10px; - float: right; - background-color: #f2dede; - color: #ad4442; -} -.btn_editStudents:hover { - cursor: pointer; - background-color: #f9e6e6; -} -.btn_editStudens:focus { - background-color: #f9e6e6; -} -.SearchStudents { - display: block; - margin-top: 20px; -} -.SearchStudents .SearchSettings { - background: #f4f4f4; - margin: 10px 0; - padding: 10px; -} -.SearchStudents .SearchSettings .SelectGrade { - float: left; - width: 49%; -} -.SearchStudents .SearchSettings .SelectStudyGroup { - float: right; - width: 49%; -} -.SearchStudents .SearchSettings .InputStudentName { - display: inline-block; - clear: both; - margin-top: 10px; -} diff --git a/~dev_rating/media/less/teacher/discipline/EditTeachers.css b/~dev_rating/media/less/teacher/discipline/EditTeachers.css deleted file mode 100644 index 7a431bcf1a23b574b09b78bee39981b07c937f99..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/teacher/discipline/EditTeachers.css +++ /dev/null @@ -1,80 +0,0 @@ -/* Прикрипление преподавателей */ -.TeachersList { - width: auto; -} -.TeachersList .Teacher { - background: #EDF1F5; - overflow: hidden; - margin: 10px 0; - padding: 7px 10px; - box-shadow: 2px 2px 2px #DDE8F0; -} -.TeachersList .Teacher .Name { - float: left; - color: #363636; -} -.TeachersList .Teacher .Action { - float: right; - font-weight: bold; - margin-left: 20px; -} -.TeachersList .Teacher .Action_ChangeOwner { - color: #0183ce; - border: 0; - background: transparent; - border-bottom: 1px solid transparent; -} -.TeachersList .Teacher .Action_ChangeOwner:hover { - cursor: pointer; - border-bottom: 1px solid #0183ce; -} -.TeachersList .Teacher .Action_UnbindTeacher { - color: #FF0000; - border: 0; - background: transparent; - border-bottom: 1px solid transparent; -} -.TeachersList .Teacher .Action_UnbindTeacher:hover { - cursor: pointer; - border-bottom: 1px solid #FF0000; -} -.TeachersList .Teacher .Action_BindTeacher { - color: #009933; - background: transparent; - border-bottom: 1px solid transparent; -} -.TeachersList .Teacher .Action_BindTeacher:hover { - cursor: pointer; - border-bottom: 1px solid #009933; -} -/* ==> */ -.BindTeachersList { - display: block; - padding: 0 4px; -} -.SearchTeachers { - display: block; - margin-top: 20px; - padding: 0 4px; -} -.SearchTeachers .SearchSettings { - background: #f4f4f4; - margin: 10px 0; - padding: 10px 10px; -} -.SearchTeachers .SearchSettings .SelectFaculty { - float: left; - width: 49%; -} -.SearchTeachers .SearchSettings .SelectDepartment { - float: right; - width: 49%; -} -.SearchTeachers .SearchSettings .InputTeacherName { - display: inline-block; - clear: both; - margin-top: 10px; -} -.InputText { - display: inline-block; -} diff --git a/~dev_rating/media/less/teacher/index.css b/~dev_rating/media/less/teacher/index.css deleted file mode 100644 index 12de989443301b7f1b4f31c6e25765d34c1eeec2..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/teacher/index.css +++ /dev/null @@ -1,98 +0,0 @@ -.info_cell, -.action_cell, -.delete_cell { - padding: 5px; - font-size: 1em; - vertical-align: middle; -} -.info_cell { - width: 20%; - color: #212121; -} -.action_cell { - width: 18%; -} -.delete_cell { - width: 4%; -} -.group_block, -.header_block { - text-align: center; -} -.header_block td { - padding: 10px; - color: #004573; -} -.discipline_groups .group_table { - margin-bottom: 10px; -} -.discipline_groups .grade_title { - color: #004573; - padding: 5px 0; - text-align: left; -} -/* ============ РЈРљР” ========================== */ -.disc_button { - margin: 5px auto; - display: block; - font-size: 0.9em; - overflow: hidden; - padding: 6px 0; - width: 90%; - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - -khtml-border-radius: 3px; -} -.disc_button.active { - background: #009933; - /*#3A84A6;*/ - color: #ffffff; -} -.disc_button.active:hover { - background: #00a336; - cursor: pointer; -} -.disc_button.inactive { - background: #6d7070; - /*#3A84A6;*/ - color: #eef1f2; -} -.disc_button.inactive:hover { - background: #797d7d; - /*#3A84A6;*/ - color: #eef1f2; -} -/* ============ Внешние границы ============== */ -.discipline_groups .group_block:first-child td { - border-top: 2px solid; - border-color: #ccc; -} -.discipline_groups .group_block:last-child td { - border-bottom: 2px solid; - border-color: #ccc; -} -button.DeleteDiscipline { - height: 27px; - width: 27px; - background: url("../../img/icons/del_dis.png") no-repeat center center; - border: 0; - cursor: pointer; -} -/* ============ Трансфер дисциплины (принимающая сторона) ================= */ -.TransferDisList.TransferDisList .TransferDisItem { - margin: 3px 0; - padding: 5px 10px; - background-color: #f5ede2; - overflow: hidden; -} -.TransferDisList.TransferDisList .TransferDisItem .Text { - display: inline-block; -} -.TransferDisList.TransferDisList .TransferDisItem .Buttons { - display: inline-block; - float: right; -} -.TransferDisList.TransferDisList .TransferDisItem button.RefuseDiscipline { - margin-left: 20px; -} diff --git a/~dev_rating/media/less/teacher/rating.css b/~dev_rating/media/less/teacher/rating.css deleted file mode 100644 index c7cbb6ef79ad9e480f79d0bf497b24261c6041a2..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/teacher/rating.css +++ /dev/null @@ -1,192 +0,0 @@ -.main { - max-width: 98%; -} -.main_content { - overflow-x: auto; -} -.h2_titleSubject { - margin-left: 1.5%; - font-weight: normal; - color: #417B9D; - margin-bottom: 5px; -} -.rate_a, -.exam_a { - /* exam rate / semester rate */ - display: inline-block; - margin-left: 1.5%; - padding-top: 5px; -} -.studentsRate { - width: 97%; - margin: 0 auto; -} -.RatingTableModulesHead { - background: #f0f7fd; -} -.RatingTableSubmodulesHead { - background: #f0f7fd; -} -/* ffffe0 */ -.RatingTableSubmodulesHeadMaxRate { - background: #f0f7fd; -} -.RatingTableSubmodulesInfo { - empty-cells: hide; -} -.title { - padding: 5px; - text-align: center; -} -.subject { - text-overflow: ellipsis; - overflow: hidden; - max-width: 70px; - padding: 5px; - text-align: center; - color: #417b9d; -} -.staticCell { - text-align: center; - color: #888; -} -.studentCell { - min-width: 150px; - max-width: 180px; - padding: 0 5px; - text-align: left; - font-size: 13px; - color: #417b9d; -} -td.group { - padding: 5px; - text-align: center; -} -td.semesterRateResultCell { - width: 60px; -} -td.rateResultCell { - width: 60px; -} -.groupSelectorWrap { - display: block; - float: right; - margin-right: 1.5%; - margin-bottom: 5px; -} -.groupSelectorText { - display: inline-block; - text-align: center; - vertical-align: middle; -} -.groupSelector { - display: inline-block; - padding: 5px; - border: 1px solid #d7d7d7; - background: #ffffff; - color: #303030; -} -.groupSelector option { - padding: 1px 10px; -} -.notif_rating { - display: block; - margin: 0 auto; - color: red; -} -table { - border-top: 1px solid #ccc; - border-right: 1px solid #ccc; - color: #363636; -} -td { - border-left: 1px solid #ccc; - border-bottom: 1px solid #ccc; - vertical-align: middle; -} -/* - div.tdInfo { - margin-top: -80px; - margin-left: -150px; - padding: 5px 10px; - position: absolute; - background: #fff; - width: 200px; - border: 1px solid #ccc; - line-height: 140%; - } - */ -td p { - width: 100%; - text-align: center; -} -td input { - display: block; - margin: 0 auto; - border: 0; - width: 100%; - height: 26px; - text-align: center; - cursor: pointer; -} -td input:hover { - background: #f1f1f1; -} -td input:focus { - background: #fff; - outline: none; -} -td input[disabled="disabled"] { - background: #fff; -} -div#tdInfo_wrap { - display: none; - position: fixed; - bottom: 0; - left: 0; - width: 100%; - background: #fff; - border: 1px solid #ccc; - line-height: 140%; -} -#tdInfo_wrap #tdInfo { - width: 900px; - margin: 15px auto; -} -#tdInfo_wrap #tdInfo #student { - display: inline-block; - min-width: 300px; -} -#tdInfo_wrap #tdInfo #submodule { - display: inline-block; - min-width: 400px; -} -#tdInfo_wrap #tdInfo #maxRate { - display: inline-block; - min-width: 100px; -} -/* todo */ -.downloadExcelStatement { - color: #CE0101; - font-weight: bold; -} -.downloadExcel { - margin-left: 30px; -} -.downloadExcelStatement:hover { - color: red; - cursor: pointer; -} -/* end todo */ -/* Copied from discipline.css */ -.canNotEdit { - position: absolute; - padding: 6px 10px; - top: 0; - right: 0; - text-align: center; - font-size: 14px; - color: #a94442; - background: #f2dede; - border-radius: 0 0 0 5px; -} diff --git a/~dev_rating/media/less/teacher/rating/ExamRating.css b/~dev_rating/media/less/teacher/rating/ExamRating.css deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/~dev_rating/media/less/teacher/rating/Rating.css b/~dev_rating/media/less/teacher/rating/Rating.css deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/~dev_rating/media/less/window/error.css b/~dev_rating/media/less/window/error.css deleted file mode 100644 index 1c17b7d69b2ae0e2dfda7291dde35d5d2dddcfac..0000000000000000000000000000000000000000 --- a/~dev_rating/media/less/window/error.css +++ /dev/null @@ -1,32 +0,0 @@ -#errButton { - position: fixed; - z-index: 300; - top: 300px; - left: 0; - width: 35px; - height: 73px; - text-align: center; - background-color: #3a84a6; - /*#6DAD53;*/ - -webkit-border-radius: 0 5px 5px 0; - -moz-border-radius: 0 5px 5px 0; - border-radius: 0 5px 5px 0; -} -#errButton:hover { - background-color: #3399cc; - cursor: pointer; -} -#errButton:active { - border: 1px inset #3399cc; -} -#errButton_img { - width: 12px; - height: 72px; - margin: 0 auto; - background-image: url(../img/icons/feedback.png); - background-repeat: no-repeat; -} -#message { - height: 300px; - resize: vertical; -} diff --git a/~dev_rating/media/img/addList.png b/~dev_rating/static/img/addList.png similarity index 100% rename from ~dev_rating/media/img/addList.png rename to ~dev_rating/static/img/addList.png diff --git a/~dev_rating/media/img/addUser.png b/~dev_rating/static/img/addUser.png similarity index 100% rename from ~dev_rating/media/img/addUser.png rename to ~dev_rating/static/img/addUser.png diff --git a/~dev_rating/media/img/close.png b/~dev_rating/static/img/close.png similarity index 100% rename from ~dev_rating/media/img/close.png rename to ~dev_rating/static/img/close.png diff --git a/~dev_rating/media/img/codes.png b/~dev_rating/static/img/codes.png similarity index 100% rename from ~dev_rating/media/img/codes.png rename to ~dev_rating/static/img/codes.png diff --git a/~dev_rating/media/img/error.png b/~dev_rating/static/img/error.png similarity index 100% rename from ~dev_rating/media/img/error.png rename to ~dev_rating/static/img/error.png diff --git a/~dev_rating/media/img/icons/add.png b/~dev_rating/static/img/icons/add.png similarity index 100% rename from ~dev_rating/media/img/icons/add.png rename to ~dev_rating/static/img/icons/add.png diff --git a/~dev_rating/media/img/icons/add_h.png b/~dev_rating/static/img/icons/add_h.png similarity index 100% rename from ~dev_rating/media/img/icons/add_h.png rename to ~dev_rating/static/img/icons/add_h.png diff --git a/~dev_rating/media/img/icons/del_dis.png b/~dev_rating/static/img/icons/del_dis.png similarity index 100% rename from ~dev_rating/media/img/icons/del_dis.png rename to ~dev_rating/static/img/icons/del_dis.png diff --git a/~dev_rating/media/img/icons/delete.png b/~dev_rating/static/img/icons/delete.png similarity index 100% rename from ~dev_rating/media/img/icons/delete.png rename to ~dev_rating/static/img/icons/delete.png diff --git a/~dev_rating/media/img/icons/delete_h.png b/~dev_rating/static/img/icons/delete_h.png similarity index 100% rename from ~dev_rating/media/img/icons/delete_h.png rename to ~dev_rating/static/img/icons/delete_h.png diff --git a/~dev_rating/media/img/icons/down.png b/~dev_rating/static/img/icons/down.png similarity index 100% rename from ~dev_rating/media/img/icons/down.png rename to ~dev_rating/static/img/icons/down.png diff --git a/~dev_rating/media/img/icons/down_h.png b/~dev_rating/static/img/icons/down_h.png similarity index 100% rename from ~dev_rating/media/img/icons/down_h.png rename to ~dev_rating/static/img/icons/down_h.png diff --git a/~dev_rating/media/img/icons/feedback.png b/~dev_rating/static/img/icons/feedback.png similarity index 100% rename from ~dev_rating/media/img/icons/feedback.png rename to ~dev_rating/static/img/icons/feedback.png diff --git a/~dev_rating/media/img/icons/ok.png b/~dev_rating/static/img/icons/ok.png similarity index 100% rename from ~dev_rating/media/img/icons/ok.png rename to ~dev_rating/static/img/icons/ok.png diff --git a/~dev_rating/media/img/icons/select2-spinner.gif b/~dev_rating/static/img/icons/select2-spinner.gif similarity index 100% rename from ~dev_rating/media/img/icons/select2-spinner.gif rename to ~dev_rating/static/img/icons/select2-spinner.gif diff --git a/~dev_rating/media/img/icons/select2.png b/~dev_rating/static/img/icons/select2.png similarity index 100% rename from ~dev_rating/media/img/icons/select2.png rename to ~dev_rating/static/img/icons/select2.png diff --git a/~dev_rating/media/img/icons/select2x2.png b/~dev_rating/static/img/icons/select2x2.png similarity index 100% rename from ~dev_rating/media/img/icons/select2x2.png rename to ~dev_rating/static/img/icons/select2x2.png diff --git a/~dev_rating/media/img/icons/tick.png b/~dev_rating/static/img/icons/tick.png similarity index 100% rename from ~dev_rating/media/img/icons/tick.png rename to ~dev_rating/static/img/icons/tick.png diff --git a/~dev_rating/media/img/icons/triangle_up.png b/~dev_rating/static/img/icons/triangle_up.png similarity index 100% rename from ~dev_rating/media/img/icons/triangle_up.png rename to ~dev_rating/static/img/icons/triangle_up.png diff --git a/~dev_rating/media/img/icons/up.png b/~dev_rating/static/img/icons/up.png similarity index 100% rename from ~dev_rating/media/img/icons/up.png rename to ~dev_rating/static/img/icons/up.png diff --git a/~dev_rating/media/img/icons/up_h.png b/~dev_rating/static/img/icons/up_h.png similarity index 100% rename from ~dev_rating/media/img/icons/up_h.png rename to ~dev_rating/static/img/icons/up_h.png diff --git a/~dev_rating/media/img/load.gif b/~dev_rating/static/img/load.gif similarity index 100% rename from ~dev_rating/media/img/load.gif rename to ~dev_rating/static/img/load.gif diff --git a/~dev_rating/media/img/messageIcon.png b/~dev_rating/static/img/messageIcon.png similarity index 100% rename from ~dev_rating/media/img/messageIcon.png rename to ~dev_rating/static/img/messageIcon.png diff --git a/~dev_rating/media/img/nextStep.png b/~dev_rating/static/img/nextStep.png similarity index 100% rename from ~dev_rating/media/img/nextStep.png rename to ~dev_rating/static/img/nextStep.png diff --git a/~dev_rating/media/img/uploadList.png b/~dev_rating/static/img/uploadList.png similarity index 100% rename from ~dev_rating/media/img/uploadList.png rename to ~dev_rating/static/img/uploadList.png diff --git a/~dev_rating/media/img/user.png b/~dev_rating/static/img/user.png similarity index 100% rename from ~dev_rating/media/img/user.png rename to ~dev_rating/static/img/user.png