hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 11:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-845 - fix close button

Browse Source 
PHRAS-846 - fix admin log view
PHRAS-843 - fix action icons
added white skin
misc fix on skin color handling
replace image icons by fonts icons
This commit is contained in:
Florian BLOUET
2015-12-01 18:48:38 +01:00
parent 696d7401d4
commit ebaf36f2d2
46 changed files with 672 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@@ -6,7 +6,7 @@
"jquery-ui": "~1.10.4",
"jquery-mobile-bower": "~1.3.0",
"underscore": "~1.4.4",
"font-awesome": "~3.0.2",
"font-awesome": "~3.2.1",
"modernizr": "~2.6.2",
"normalize-css": "~2.1.0",
"json2": "latest",

119
lib/conf.d/minifyGroupsConfig.php
View File

@@ -9,132 +9,13 @@
* changes. http://yourdomain/min/builder/
* */
$groups = [
'account' => [
'//include/jslibs/jquery.contextmenu_scroll.js',
'//assets/jquery.cookie/jquery.cookie.js',
'//include/jquery.common.js',
'//assets/requirejs/require.js',
'//skins/account/account.js'
],
'authentication_css' => [
'//assets/normalize-css/normalize.css',
'//assets/build/login.css',
'//assets/font-awesome/css/font-awesome.css',
'//assets/jquery.ui/jquery.ui.autocomplete.css'
],
'authentication' => [
'//assets/modernizr/modernizr.js',
'//assets/requirejs/require.js',
'//scripts/apps/login/home/config.js'
],
'admin' => [
'//assets/modernizr/modernizr.js'
, '//assets/underscore-amd/underscore.js'
, '//assets/jquery.cookie/jquery.cookie.js'
, '//assets/jquery.treeview/jquery.treeview.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//include/jquery.kb-event.js'
, '//skins/admin/template-dialogs.js'
, '//include/jquery.common.js'
, '//include/jquery.tooltip.js'
, '//skins/prod/jquery.Dialog.js'
, '//include/jslibs/jquery.contextmenu_scroll.js'
, '//assets/blueimp-load-image/load-image.js'
, '//assets/jquery-file-upload/jquery.iframe-transport.js'
, '//assets/jquery-file-upload/jquery.fileupload.js'
],
'report' => [
'//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//assets/jquery.cookie/jquery.cookie.js'
, '//include/jquery.common.js'
, '//include/jquery.tooltip.js'
, '//include/jslibs/jquery.contextmenu_scroll.js'
, '//include/jslibs/jquery.print.js'
, '//include/jslibs/jquery.cluetip.js'
, '//include/jquery.nicoslider.js'
, '//skins/report/report.js'
],
'modalBox' => [
'//assets/jquery.ui/i18n/jquery-ui-i18n.js'
],
'prod' => [
'//assets/swfobject/swfobject.js'
, '//assets/underscore-amd/underscore.js'
, '//assets/json2/json2.js'
, '//include/jslibs/colorpicker/js/colorpicker.js'
, '//include/jslibs/jquery.mousewheel.js'
, '//include/jslibs/jquery.lazyload/jquery.lazyload.1.8.1.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//assets/jquery.cookie/jquery.cookie.js'
, '//include/jquery.common.js'
, '//assets/humane-js/humane.js'
, '//assets/blueimp-load-image/load-image.js'
, '//assets/jquery-file-upload/jquery.iframe-transport.js'
, '//assets/jquery-file-upload/jquery.fileupload.js'
, '//include/jslibs/jquery.form.2.49.js'
, '//include/jslibs/jquery.vertical.buttonset.js'
, '//include/js/jquery.Selection.js'
, '//include/js/jquery.Edit.js'
, '//include/js/jquery.lists.js'
, '//skins/prod/jquery.Prod.js'
, '//skins/prod/jquery.Dialog.js'
, '//skins/prod/jquery.Feedback.js'
, '//skins/prod/jquery.Results.js'
, '//skins/prod/jquery.main-prod.js'
, '//skins/prod/jquery.WorkZone.js'
, '//skins/prod/jquery.Alerts.js'
, '//skins/prod/jquery.Upload.js'
, '//include/jslibs/pixastic.custom.js'
, '//skins/prod/ThumbExtractor.js'
, '//skins/prod/publicator.js'
, '//include/jslibs/jquery.sprintf.1.0.3.js'
, '//include/jquery.tooltip.js'
, '//include/jslibs/flowplayer/flowplayer-3.2.13.min.js'
, '//include/jquery.p4.preview.js'
, '//skins/prod/jquery.edit.js'
, '//include/jslibs/jquery.color.animation.js'
, '//include/jquery.image_enhancer.js'
, '//include/jslibs/jquery.contextmenu_scroll.js'
, '//assets/jquery.treeview/jquery.treeview.js'
, '//assets/jquery.treeview/jquery.treeview.async.js'
, '//assets/requirejs/require.js'
],
'thesaurus' => [
'//assets/jquery.cookie/jquery.cookie.js'
, '//include/jslibs/jquery.contextmenu_scroll.js'
, '//include/jquery.common.js'
, '//skins/thesaurus/win.js'
, '//skins/thesaurus/xmlhttp.js'
, '//skins/thesaurus/thesaurus.js'
, '//skins/thesaurus/sprintf.js'
],
'lightbox' => [
'//include/jslibs/jquery.mousewheel.js'
, '//include/jquery.tooltip.js'
, '//assets/swfobject/swfobject.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//assets/jquery.cookie/jquery.cookie.js'
, '//include/jslibs/jquery.contextmenu_scroll.js'
, '//include/jquery.common.js'
, '//skins/prod/jquery.Dialog.js'
, '//skins/lightbox/jquery.lightbox.js'
, '//include/jslibs/flowplayer/flowplayer-3.2.13.min.js'
],
'lightboxie6' => [
'//include/jslibs/jquery.mousewheel.js'
, '//include/jquery.tooltip.js'
, '//assets/swfobject/swfobject.js'
, '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
, '//assets/jquery.cookie/jquery.cookie.js'
, '//include/jslibs/jquery.contextmenu_scroll.js'
, '//include/jquery.common.js'
, '//skins/prod/jquery.Dialog.js'
, '//skins/lightbox/jquery.lightbox.ie6.js'
, '//include/jslibs/flowplayer/flowplayer-3.2.13.min.js'
],
'uploadflash' => [
'//include/jslibs/SWFUpload/swfupload.js'
, '//include/jslibs/SWFUpload/plugins/swfupload.queue.js'
]
];

15
resources/gulp/components/prod.js
View File

@@ -38,6 +38,13 @@ gulp.task('copy-prod-skin-grey-images', function(){
.pipe(gulp.dest( config.paths.build + 'prod/skins/959595/images'));
});
gulp.task('copy-prod-skin-white-images', function(){
return gulp.src([
config.paths.src + 'prod/skins/FFFFFF/images/**/*'
])
.pipe(gulp.dest( config.paths.build + 'prod/skins/FFFFFF/images'));
});
gulp.task('copy-prod-images', function(){
return gulp.src([config.paths.src + 'prod/images/**/*'])
.pipe(gulp.dest( config.paths.build + 'prod/images'));
@@ -55,7 +62,13 @@ gulp.task('build-prod-skin-grey', ['copy-prod-skin-grey-images'], function(){
], 'skin-959595', 'prod/skins/959595/', debugMode);
});
gulp.task('build-prod-css', ['build-prod-skin-black', 'build-prod-skin-grey'], function(){
gulp.task('build-prod-skin-white', ['copy-prod-skin-white-images'], function(){
return utils.buildCssGroup([
config.paths.src + 'prod/skins/FFFFFF/skin-FFFFFF.scss'
], 'skin-FFFFFF', 'prod/skins/FFFFFF/', debugMode);
});
gulp.task('build-prod-css', ['build-prod-skin-black', 'build-prod-skin-grey', 'build-prod-skin-white'], function(){
return utils.buildCssGroup([
config.paths.src + 'prod/styles/main.scss'
], 'prod', 'prod/css/', debugMode);

5
resources/gulp/components/vendors/bootstrap.js vendored
View File

@@ -43,7 +43,10 @@ gulp.task('build-bootstrap', ['bootstrap-assets', 'bootstrap-js'], function () {
.pipe(cssmin())
.pipe(rename({ suffix: '.min' }))
.pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css'));
gulp.src(config.paths.vendors + 'bootstrap-sass/vendor/assets/stylesheets/bootstrap-responsive.scss')
gulp.src([
config.paths.vendors + 'bootstrap-sass/vendor/assets/stylesheets/bootstrap-responsive.scss',
config.paths.vendors + 'bootstrap-sass/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss'
])
.pipe(sass().on('error', sass.logError))
.pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css/'))
.pipe(cssmin())

6
resources/gulp/utils.js
View File

@@ -31,7 +31,11 @@ exports.buildJsGroup = function(srcGroup, name, dest, debugMode){
return gulp.src(srcGroup)
.pipe(concat(name + '.js', {newLine: ';'}))
.pipe(gulp.dest( config.paths.build + dest))
.pipe(uglify().on('error', config.errorHandler('UGLIFY ERROR'))) //util.log))
.pipe(uglify({
compress: {
drop_console: true
}
}).on('error', config.errorHandler('UGLIFY ERROR'))) //util.log))
.pipe(rename({ extname: '.min.js' }))
.pipe(gulp.dest( config.paths.build + dest))
};

1
resources/www/_shared/styles/_main-menu.scss
View File

@@ -18,6 +18,7 @@ $mainMenuBottomBorder: none !default;
border-bottom: $mainMenuBottomBorder;
margin-bottom: $mainMenuMarginBottom;
z-index: 100;
box-sizing: border-box;
ol {
display: block;
margin: 0;

10
resources/www/_shared/styles/_variables.scss
View File

@@ -1,13 +1,13 @@
$fontAwesomePath: '/assets/common/font' !default; // dist path
$iconsPath: '/assets/common/images/icons/' !default;
$mainMenuHeight: 40px;
$mainMenuLineHeight: 36px;
$mainMenuHeight: 40px !default;
$mainMenuLineHeight: 36px !default;
$baseBorderRadius: 3px;
$borderRadiusLarge: 4px;
$borderRadiusSmall: 2px;
$baseBorderRadius: 3px !default;
$borderRadiusLarge: 4px !default;
$borderRadiusSmall: 2px !default;
$defaultFontFamily: Helvetica, Arial, sans-serif;

2
resources/www/account/styles/main.scss
View File

@@ -4,7 +4,7 @@
@import 'variables';
@import '../../vendors/bootstrap/bootstrap';
@import 'skin';
@import '../../../../www/bower_components/font-awesome/sass/font-awesome.scss';
@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss';
@import '../../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import
$mainMenuBackgroundColor: #3b3b3b;

2
resources/www/authentication/styles/main.scss
View File

@@ -6,5 +6,5 @@
@import '../../account/styles/skin';
//@import '../../../../plugins/login.scss';
@import '../../../../www/bower_components/font-awesome/sass/font-awesome.scss';
@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss';
@import '../../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import

BIN
resources/www/common/images/icons/icon_magnify.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/www/common/images/icons/workzoneEscamote.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/www/common/images/icons/workzoneEscamote_on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

1
resources/www/common/js/jquery.tooltip.js
View File

@@ -300,7 +300,6 @@
topOffset = 20,
leftOffset = 20;
console.log($eventTarget.length)
if( $eventTarget.length > 0 ) {
// change offsets:
topOffset = -8;

2
resources/www/common/styles/main.scss
View File

@@ -5,7 +5,7 @@
@import '../../vendors/bootstrap/bootstrap';
@import '../../vendors/bootstrap/responsive';
@import '../../_shared/styles/override-bootstrap';
@import '../../../../www/bower_components/font-awesome/sass/font-awesome.scss';
@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss';
@import '../../_shared/styles/main';
$mainMenuBackgroundColor: #212121; //BFBFBF;

2
resources/www/prod/js/jquery.main-prod.js
View File

@@ -1342,6 +1342,7 @@ $(document).ready(function () {
$('#idFrameC #retractableButton').bind('click', function (event) {
if($('#idFrameC').attr('data-status') != 'closed'){
$(this).find('i').removeClass('icon-double-angle-left').addClass('icon-double-angle-right')
$('#idFrameC').width(80);
$('#rightFrame').css('left', 80);
$('#rightFrame').width($(window).width()-80);
@@ -1352,6 +1353,7 @@ $(document).ready(function () {
$('#idFrameC').addClass('closed');
previousTab = $('#idFrameC .icon-menu').find('li.ui-tabs-active');
}else{
$(this).find('i').removeClass('icon-double-angle-right').addClass('icon-double-angle-left')
$('#idFrameC').width(300);
$('#rightFrame').css('left', 300);
$('#rightFrame').width($(window).width()-300);

BIN
resources/www/prod/skins/000000/images/suggested.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 54 B

43
resources/www/prod/skins/000000/skin-000000.scss
View File

@@ -19,6 +19,7 @@ $highlightTextColor: #FFFFFF;
$darkerBackgroundColor: #1A1A1A;
$darkerBorderColor: #404040;
$darkerTextColor: #FFFFFF;
$darkerTextHoverColor: #FFFFFF;
$darkBackgroundColor: #292929;
$darkBorderColor: #303030;
@@ -47,12 +48,10 @@ $bgInverseHoverColor: #FFF;
/******* GLOBAL PROD **********************************************************/
$mainMenuLinkColor: #b1b1b1;
$mainMenuRightListBorderLeft: #292929;
$scrollBgColor: #3b3b3b;
$paginateBorderColor: #3b3b3b;
$paginateTextColor: #3b3b3b;
$paginateBg1: #141414;
$contextMenuBgHover: $highlightDarkerColor;
@@ -71,20 +70,13 @@ $bridgeDropdownMenuHoverColor: #FFFFFF;
$thesaurusInputBackground: #ededed;
$thesaurusContextMenuColor: #c0c0c0;
$proposalsTitle: #A6A6A6;
$proposalsTitleBorder: #303030;
$basketsTextColor: #AAAAAA;
$guiSplitterImg: 'vsplitter2.png';
$workzoneTabBgHover: #666666;
$workzoneTabBgActive: #333333;
$workzoneTabBorderTop: #303030;
$workzoneTabBorderBottom: #303030;
$workzoneBasketAlertDataBg: #fff190;
$workzoneBasketAlertDataColor: #1a1a1a;
$workzoneToolsLabelColor: #7f7f7f;
$answersToolsBtnSeparatorBorder: #474747;
$answersToolsBtnBg: #393939;
@@ -139,6 +131,33 @@ $widgetContentColor: $textPrimaryColor;
$linkDefaultColor: #b1b1b1;
$linkDefaultHover: #838383;
/******** MAIN MENU CONFIG ********/
$mainMenuBackgroundColor: $mediumBackgroundColor;
$mainMenuBottomBorder: 1px solid $mediumBorderColor;
$mainMenuHeight: 41px;
$mainMenuMarginBottom: 0;
$mainMenuLinkColor: #b1b1b1;
$mainMenuLinkBackgroundHoverColor: transparent;
$mainMenuLinkHoverColor: $textPrimaryHoverColor;
@import '../../../_shared/styles/variables';
/******** WORKZONE TABS CONFIG ********/
$workzoneBackgroundColor: $mediumBackgroundColor;
$workzoneTabBackgroundColor: $mediumBackgroundColor;
$workzoneTabBgHover: #666666;
$workzoneTabBgActive: #333333;
$workzoneTabTopBorder: 1px solid #303030;
$workzoneTabBorderBottom: #303030;
$workzoneBasketAlertDataBg: #fff190;
$workzoneBasketAlertDataColor: #1a1a1a;
$workzoneToolsLabelColor: #7f7f7f;
/******** PROPOSALS CONFIG ********/
$proposalsTitleColor: #A6A6A6;
$proposalsTitleHoverColor: lighten($proposalsTitleColor, 5);
$proposalsTitleBorder: #303030;
@import '../../../_shared/styles/jquery-ui/dark-hive';
@import '../skin-shared';

BIN
resources/www/prod/skins/959595/images/suggested.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 58 B

44
resources/www/prod/skins/959595/skin-959595.scss
View File

@@ -20,6 +20,7 @@ $highlightTextColor: #FFFFFF;
$darkerBackgroundColor: #D9D9D9; // #F1F1F1 <- to try
$darkerBorderColor: darken(#D9D9D9, 10);
$darkerTextColor: #333333;
$darkerTextHoverColor: #000000;
$darkBackgroundColor: #9c9c9c; //B1B1B1;
$darkBorderColor: darken($darkBackgroundColor, 10);
@@ -46,12 +47,11 @@ $textInverseHoverColor: #000;
$bgInverseHoverColor: #FFF;
/******* GLOBAL PROD **********************************************************/
$mainMenuLinkColor: #FFF;
$mainMenuRightListBorderLeft: #999;
$scrollBgColor: $mediumBackgroundColor; //#3b3b3b;
$paginateBorderColor: #999999;
$paginateTextColor: #999999;
// $paginateBorder2Color: #999999;
// $paginateTextColor: #FFFFFF;
$paginateBg1: #D9D9D9;
@@ -71,20 +71,13 @@ $thesaurusInputBackground: #d4d4d4;
$thesaurusContextMenuColor: #FFFFFF;
$proposalsTitle: #FFFFFF;
$proposalsTitleBorder: #666666;
$basketsTextColor: #777777;
$guiSplitterImg: 'vsplitter2-959595.png';
$workzoneTabBgHover: #999;
$workzoneTabBgActive: #999;
$workzoneTabBorderTop: #999;
$workzoneTabBorderBottom: transparent;
$workzoneBasketAlertDataBg: #fff190;
$workzoneBasketAlertDataColor: #1a1a1a;
$workzoneToolsLabelColor: #FFFFFF;
$answersToolsBtnSeparatorBorder: #999;
@@ -152,5 +145,34 @@ $uiTextTitleColor: $mediumTextColor;
$uiLinkColor: $darkTextColor;
$uiLinkFocusColor: $darkTextColor;
$uiLinkActiveColor: $darkTextColor;
/******** MAIN MENU CONFIG ********/
// $mainMenuRightListBorderLeft: #999;
$mainMenuBottomBorder: none;
$mainMenuBackgroundColor: $mediumBackgroundColor; //BFBFBF;
$mainMenuBottomBorder: none;
$mainMenuMarginBottom: 0;
$mainMenuLinkColor: #FFF;
$mainMenuLinkBackgroundHoverColor: transparent; //$bgInverseHoverColor;
$mainMenuLinkHoverColor: $textPrimaryHoverColor;
@import '../../../_shared/styles/variables';
/******** WORKZONE TABS CONFIG ********/
$workzoneBackgroundColor: $mediumBackgroundColor;
$workzoneTabBackgroundColor: $mediumBackgroundColor;
$workzoneTabBgHover: #999;
$workzoneTabBgActive: #999;
$workzoneTabTopBorder: 1px solid #999;
$workzoneTabBorderBottom: transparent;
$workzoneBasketAlertDataBg: #fff190;
$workzoneBasketAlertDataColor: #1a1a1a;
$workzoneToolsLabelColor: #FFFFFF;
/******** PROPOSALS CONFIG ********/
$proposalsTitleColor: #FFFFFF;
$proposalsTitleBorder: #666666;
@import '../../../_shared/styles/jquery-ui/ui-lightness';
@import '../skin-shared';

190
resources/www/prod/skins/FFFFFF/skin-FFFFFF.scss Normal file
View File

@@ -0,0 +1,190 @@
$skinsImagesPath: '/assets/vendors/jquery-ui/images/ui-lightness/';
$defaultBorderColor: #999999;
$defaultBorderRadius: 2px;
$textPrimaryColor: #333333;
$textPrimaryHoverColor: #1a1a1a;
$textPrimaryActiveColor: #1a1a1a;
$textPrimaryInverseColor: #1a1a1a; //3b3b3b;
$textSecondaryColor: #999999;
$highlightDarkerColor: #0c4554;
$highlightBackgroundColor: #076882;
$highlightBackgroundAltColor: #0c4554;
$highlightBorderColor: #0c4554;
$highlightTextColor: #FFF;
$darkerBackgroundColor: #FFFFFF; // #F1F1F1 <- to try
$darkerBorderColor: #bfbfbf;
$darkerTextColor: #333;
$darkerTextHoverColor: #000000;
$darkBackgroundColor: #FFFFFF; //B1B1B1;
$darkBorderColor: darken($darkBackgroundColor, 10);
$darkTextColor: #9c9c9c;
$mediumBackgroundColor: #f2f2f2; // B2B2B2 <- to try
$mediumBorderColor: #FFF; //darken($mediumBackgroundColor, 10);
$mediumBorderHighlightColor: #bfbfbf;
$mediumTextColor: $textPrimaryColor;
$mediumTextHoverColor: #EAEAEA;
$mediumTextActiveColor: #EAEAEA;
$lightBackgroundColor: #9c9c9c;
$lightBackgroundSelectedColor: darken($lightBackgroundColor, 10);
$lightBackgroundActiveColor: darken($lightBackgroundColor, 10);
$lightBorderColor: #B1B1B1;
$lightBorderSelectedColor: darken($lightBorderColor, 10);
$lightBorderActiveColor: darken($lightBorderColor, 10);
$lightTextColor: #3b3b3b;
// inverse
$textInverseColor: #000;
$textInverseHoverColor: #000;
$bgInverseHoverColor: #333;
/******* GLOBAL PROD **********************************************************/
$scrollBgColor: $mediumBackgroundColor; //#3b3b3b;
$paginateBorderColor: #bfbfbf;
$paginateTextColor: #FFFFFF;
$paginationLinkColor: #333;
// $paginateBorder2Color: #999999;
// $paginateTextColor: #FFFFFF;
$paginateBg1: #D9D9D9;
$uploadBg1: #FFFFFF;
$uploadBg2: transparent;
$uploadLoaderImg: 'loader-black.gif';
$bridgeDropdownToggleBg: #E6E6E6;
$bridgeDropdownMenuBg: #f2f2f2;
$bridgeDropdownMenuBorder: #bfbfbf;
$bridgeDropdownMenuColor: #EAEAEA;
$bridgeDropdownMenuHoverBg: #bfbfbf;
$bridgeDropdownMenuHoverColor: #FFFFFF;
$thesaurusInputBackground: #d4d4d4;
$thesaurusContextMenuColor: #FFFFFF;
$basketsTextColor: #777777;
$guiSplitterImg: 'vsplitter2-959595.png';
$answersToolsBtnSeparatorBorder: #EAEAEA;
$answersToolsBtnBg: #f2f2f2;
$answersToolsBtnBorder: #bfbfbf;
$answersToolsBtnColor: #5b5b5b;
$answersToolsBtnHoverBg: #bfbfbf;
$answersToolsBtnHoverColor: #FFFFFF;
$answersToolsBtnSettingsColor: #000; //lighten($answersToolsBtnColor, 10);
$answersToolsBtnSettingsHoverBg: #393939;
$answersToolsBtnSettingsHoverColor: lighten($answersToolsBtnColor, 10);
$answersToolsBtnSettingsBorder: #EAEAEA;
// $diapoBorderColor: $darkerBorderColor;
$editTextMultiValueBg: #FFFFFF;
$editTextMultiValueBorder: #999999;
$editTextMultiValueHighlightBg: #d0d0d0;
$preferencesLabelColor: #333333;
$activeStateIcon: 'ui-icons_ffffff_256x240.png';
$accordionLoaderImg: 'loader-black.gif';
$accordionBgHeaderHover: #999;
$inputButtonHoverColor: #FEFEFE;
$inputFallbackBorderColor: #b1b1b1;
$dropdownDividerBg: $darkerBorderColor;
$dropdownDividerBorder: $darkerBorderColor;
$overlayBg: #B1B1B1;
$tabsNavBg: #999999;
$tabsNavBgActive: #B2B2B2; //#D9D9D9;
$contentLoaderImg: 'loader-black.gif';
/*$btnBackground: #444444; //#B9B9B9;
$btnBackgroundHighlight: #393939;
$btnColor: #AAAAAA;
$btnTextShadow: 0 -1px 0 rgba(0,0,0,.25);*/
$btnBackground: #f2f2f2;
$btnBackgroundHighlight: #D6D6D6;
$btnColor: #737373;
$btnTextShadow: 0 -1px 0 rgba(0,0,0,0);
$btnInverseBackground: #f2f2f2;
$btnInverseBackgroundHighlight: #d6d6d6;
$btnInverseColor: #5b5b5b;
$btnInverseTextShadow: 0 -1px 0 rgba(255,255,255,.25);
$btnGrpSeparatorColor: $defaultBorderColor;
$widgetContentColor: $textPrimaryInverseColor;
$linkDefaultColor: #444444;
$linkDefaultHover: #444444;
// override jquery ui theme colors:
$uiTextContentColor: $mediumTextColor;
$uiTextTitleColor: $mediumTextColor;
$uiLinkColor: $darkTextColor;
$uiLinkFocusColor: $darkTextColor;
$uiLinkActiveColor: $darkTextColor;
/******** MAIN MENU CONFIG ********/
$mainMenuBottomBorder: none;
$mainMenuBackgroundColor: #1a1a1a; //BFBFBF;
$mainMenuBottomBorder: none;
$mainMenuMarginBottom: 0;
$mainMenuLinkColor: #FFFFFF;
$mainMenuLinkBackgroundHoverColor: transparent; //$bgInverseHoverColor;
$mainMenuLinkHoverColor: darken($mainMenuLinkColor, 10);
@import '../../../_shared/styles/variables';
/******** PROPOSALS CONFIG ********/
$proposalsTitleColor: #333;
$proposalsTitleBorder: #bfbfbf;
//$proposalsContentTextColor: #FF0000;
/******** WORKZONE TABS CONFIG ********/
$workzoneBackgroundColor: $mediumBackgroundColor;
$workzoneTabBgHover: #EAEAEA;
$workzoneTabBgActive: #EAEAEA;
$workzoneTabTopBorder: 1px solid #EAEAEA;
$workzoneTabBorderBottom: transparent;
$workzoneBasketAlertDataBg: #fff190;
$workzoneBasketAlertDataColor: #1a1a1a;
$workzoneToolsLabelColor: #FFFFFF;
/******** TABS CONFIG ********/
$tabContentBackgroundColor: #f5f5f5;
$tabBackgroundColor: #f2f2f2;
$tabTextColor: lighten($textPrimaryInverseColor, 10);
$tabActiveBackgroundColor: $tabContentBackgroundColor;
$tabActiveTextColor: $textPrimaryInverseColor;
$tabDisabledBackgroundColor: $tabBackgroundColor;
$tabDisabledTextColor: $mediumTextActiveColor;
/******** ANSWERS INFOS CONFIG ********/
$answersInfoDialogBg: $highlightBackgroundAltColor !default;
$answersInfoDialogColor: #FFFFFF !default;
$answersDocInfoBg: $highlightBackgroundAltColor !default;
$answersDocInfoBorder: #FAFAFA !default;
$answersDocInfoColor: #FFFFFF !default;
$answersLinkColor: #FFFFFF !default;
$answersInfoLabelColor: #FFFFFF !default;
@import '../../../_shared/styles/jquery-ui/ui-lightness';
@import '../skin-shared';

32
resources/www/prod/skins/skin-shared.scss
View File

@@ -130,6 +130,7 @@ EM {
}
#mainContent {
margin-top: $mainMenuHeight;
// top: 40px;
min-width: 960px;
overflow-x: auto;
@@ -374,24 +375,18 @@ span.ww_winTitle {
margin: 2px 0;
}
IFRAME {
BORDER-RIGHT: #000000 1px solid;
PADDING-RIGHT: 0px;
BORDER-TOP: #000000 1px solid;
PADDING-LEFT: 0px;
PADDING-BOTTOM: 0px;
MARGIN: 0px;
BORDER-LEFT: #000000 1px solid;
PADDING-TOP: 0px;
BORDER-BOTTOM: #000000 1px solid
iframe {
border: none;
margin: 0;
padding: 0;
}
H4 {
MARGIN-TOP: 0px;
FONT-WEIGHT: normal;
FONT-SIZE: 16px;
MARGIN-BOTTOM: 0px;
MARGIN-LEFT: 5px
h4 {
margin-top: 0px;
font-weight: normal;
font-size: 16px;
margin-bottom: 0px;
margin-left: 5px
}
#notification_trigger .counter {
@@ -511,6 +506,9 @@ H4 {
box-shadow: inset 1px 1px 2px 0px rgba(0, 0, 0, 0.7);
}
}
#loader {
color: $textPrimaryInverseColor;
}
@import 'ui-components/jquery-ui';
@import 'ui-components/context-menu';
@@ -528,7 +526,7 @@ H4 {
@import 'ui-components/modal-edit';
@import 'ui-components/modal-export';
@import 'ui-components/modal-bridge';
@import 'ui-components/main-menu';
@import '../../_shared/styles/main-menu';
@import 'ui-components/workzone-thesaurus';
@import 'ui-components/workzone-baskets';
@import 'ui-components/workzone-proposals';

2
resources/www/prod/skins/ui-components/_actions.scss
View File

@@ -98,6 +98,7 @@
background-repeat: no-repeat;
}
*/
/*
.contextMenuTrigger {
color: $textPrimaryColor;
font-size: $smallFontSize;
@@ -109,3 +110,4 @@
.contextMenuTrigger:hover {
color: $textPrimaryColor;
}
*/

81
resources/www/prod/skins/ui-components/_answers-tools.scss
View File

@@ -3,39 +3,33 @@
#idFrameT {
margin-left: -20px;
margin-right: -20px;
}
#idFrameT #selectCase {
#selectCase {
background: url('#{$iconsPath}ccoch0.gif') no-repeat center center;
padding-left: 16px;
}
#idFrameT .btn-toolbar {
.btn-toolbar {
margin-bottom: 0px;
margin-top: 0px;
background-color: $mediumBackgroundColor;
font-size: $smallFontSize;
z-index:100;
height:45px;
box-sizing: border-box;
border-bottom: none; //1px solid $darkerBorderColor;
}
#idFrameT .tools .classicButton button.btn,
#idFrameT .tools .dropdownButton {
margin: 0;
}
#idFrameT .tools:first-child .btn-group {
.tools {
&:first-child .btn-group {
border-right: 1px solid $answersToolsBtnSeparatorBorder;
}
#idFrameT .tools .btn-group {
.btn-group {
float: left;
}
#idFrameT .tools .classicButton button.btn,
#idFrameT .tools .dropdownButton button.btn {
.classicButton button.btn,
.dropdownButton {
margin: 0;
}
.classicButton button.btn,
.dropdownButton button.btn {
height: 30px;
font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: $mediumFontSize;
@@ -43,62 +37,54 @@
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
#idFrameT .tools .classicButton button.btn-inverse,
#idFrameT .tools .dropdownButton button.btn-inverse {
.classicButton button.btn-inverse,
.dropdownButton button.btn-inverse {
background-image: none;
background-color: $mediumBackgroundColor;
color: $answersToolsBtnColor;
border-radius: 0;
margin: 0;
height: 45px;
border: 0;
}
#idFrameT .tools .classicButton button.btn-inverse {
.classicButton button.btn-inverse {
border-right: 0;
}
#idFrameT .tools .dropdownButton button.btn-inverse {
.dropdownButton button.btn-inverse {
border-left: 0;
border-right: 0;
}
#idFrameT .tools .classicButton button.btn-inverse:hover,
#idFrameT .tools .dropdownButton button.btn-inverse:hover {
.classicButton button.btn-inverse:hover,
.dropdownButton button.btn-inverse:hover {
background-color: $answersToolsBtnBg;
*background-color: $answersToolsBtnBg;
color: $textPrimaryHoverColor;
}
#idFrameT .tools .classicButton button.btn-inverse img,
#idFrameT .tools .dropdownButton button.btn-inverse img {
.classicButton button.btn-inverse img,
.dropdownButton button.btn-inverse img {
margin: 0 2px;
max-width: none;
}
#idFrameT .tools .dropdown-menu {
.dropdown-menu {
min-width: 95px;
background-color: $answersToolsBtnBg;
*border: 1px solid $answersToolsBtnBorder;
}
#idFrameT .tools .dropdown-menu a {
a {
padding: 3px 10px;
font-size: $mediumFontSize;
color: $answersToolsBtnColor;
cursor: pointer;
}
#idFrameT .tools .dropdown-menu a:hover {
&:hover {
background-color: $answersToolsBtnHoverBg;
color: $highlightTextColor; //$answersToolsBtnHoverColor;
}
#idFrameT .tools .dropdown-menu img {
}
img {
margin-right: 5px;
}
#idFrameT .tools #settings {
}
#settings {
display: block;
float: right;
line-height: 45px;
@@ -109,11 +95,13 @@
background: url('#{$iconsPath}icone_settings.png') right 15px no-repeat;
background-position: right 21px top 15px;
border-left: 1px solid $answersToolsBtnSettingsBorder;
}
#idFrameT .tools #settings:hover {
&:hover {
background-color: $answersToolsBtnSettingsHoverBg;
}
}
}
}
@media screen and (max-width: 1200px) {
#idFrameT .tools button.btn-inverse img {
display: none;
@@ -124,5 +112,6 @@
padding-left: 0px;
margin-right: 8px;
width: 26px;
background-position: right 1px top 15px;
}
}

17
resources/www/prod/skins/ui-components/_answers.scss
View File

@@ -11,8 +11,9 @@ $answersInfoLabelColor: #949494 !default;
margin: 0;
}
.captionRolloverTips, .previewTips, .infoTips,
.baskAdder, .printer, .downloader, .baskDeleter {
// .captionRolloverTips, .previewTips, .infoTips,
/*
.baskAdder {
background-image: url('#{$iconsPath}zoom.gif');
background-repeat: no-repeat;
background-position: center center;
@@ -33,18 +34,9 @@ $answersInfoLabelColor: #949494 !default;
.baskAdder {
background-image: url('#{$iconsPath}basket.gif');
}
*/
.baskDeleter {
background-image: url('#{$iconsPath}delete.gif');
}
.printer {
background-image: url('#{$iconsPath}print.gif');
}
.downloader {
background-image: url('#{$iconsPath}download.gif');
}
#answers {
.status {
img {
@@ -74,7 +66,6 @@ $answersInfoLabelColor: #949494 !default;
#idFrameT {
#answers {
background-color: $darkerBackgroundColor;
border: 1px solid $darkerBorderColor;
top: 55px;
bottom: 0;
margin-right: 8px;

26
resources/www/prod/skins/ui-components/_diapo.scss
View File

@@ -52,11 +52,35 @@ $diapoBorderColor: $darkerBorderColor !default;
position: absolute;
bottom: 0;
z-index: 100;
&.actions {
/*.action-icon {
cursor: pointer;
font-size: 12px;
}*/
.icon-stack {
font-size: 11px;
cursor: pointer;
width: 19px;
height: 15px;
line-height: 12px;
//padding: 0;
//margin: 0;
}
.icon-stack-base {
color: #777777; //darken($darkerBackgroundColor, 10);
}
.icon-light {
color: $darkerBackgroundColor; //$darkerTextColor;
}
}
}
div.title {
.title {
overflow: hidden;
text-overflow: ellipsis;
line-height: 14px;
font-size: $mediumFontSize;
}
.duration {

23
resources/www/prod/skins/ui-components/_jquery-ui.scss
View File

@@ -1,6 +1,14 @@
$modalBorder: 1px solid $darkerBorderColor !default;
$modalBackground: $darkerBackgroundColor !default;
$tabContentBackgroundColor: $mediumBackgroundColor !default;
$tabBackgroundColor: lighten($lightBackgroundColor, 5) !default;
$tabTextColor: $mediumTextColor !default;
$tabActiveBackgroundColor: $tabContentBackgroundColor !default;
$tabActiveTextColor: $lightTextColor !default;
$tabDisabledBackgroundColor: $tabBackgroundColor !default;
$tabDisabledTextColor: $mediumTextActiveColor !default;
.ui-dialog .ui-dialog-content.loading, .loading {
background-image: url('#{$iconsPath}#{$contentLoaderImg}');
background-position: center center;
@@ -26,7 +34,7 @@ $modalBackground: $darkerBackgroundColor !default;
.ui-tabs {
.ui-tabs-nav {
li {
background-color: lighten($lightBackgroundColor, 5); //$tabsNavBg;
background-color: $tabBackgroundColor;
height: 30px;
border: none;
overflow: hidden;
@@ -37,13 +45,14 @@ $modalBackground: $darkerBackgroundColor !default;
font-weight: normal;
color: $mediumTextColor; // more contrasted color
}
&.ui-tabs-active a,
&.ui-tabs-active {
font-size: $mediumFontSize;
color: $lightTextColor;
background-color: $mediumBackgroundColor; //$tabsNavBgActive;
color: $tabActiveTextColor;
background-color: $tabActiveBackgroundColor; //$tabsNavBgActive;
border: none;
}
&.ui-tabs-active a,
&.ui-state-disabled a,
&.ui-state-processing a {
cursor: pointer;
@@ -58,7 +67,7 @@ $modalBackground: $darkerBackgroundColor !default;
display: block;
border-width: 0;
padding: 0px;
background-color: $mediumBackgroundColor;
background-color: $tabContentBackgroundColor;
&.tabBox {
height: 405px;
overflow: auto;
@@ -77,7 +86,7 @@ $modalBackground: $darkerBackgroundColor !default;
.ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
cursor: pointer;
color: $mediumTextColor; //$workzoneColor2;
color: $tabTextColor; //$workzoneColor2;
}
.ui-state-default, .ui-widget-content .ui-state-default {
@@ -85,7 +94,7 @@ $modalBackground: $darkerBackgroundColor !default;
}
.ui-tabs li.ui-state-active a, .ui-state-active a:link, .ui-state-active a {
color: $mediumTextActiveColor;
color: $tabActiveTextColor;
font-weight: bold;
//font-size: 0.8em;
}

12
resources/www/prod/skins/ui-components/_main-menu.scss
View File

@@ -1,12 +0,0 @@
@import '../../../_shared/styles/variables';
$mainMenuBottomBorder: none;
$mainMenuBackgroundColor: $mediumBackgroundColor; //BFBFBF;
$mainMenuBottomBorder: none;
$mainMenuMarginBottom: 0;
$mainMenuLinkColor: $mainMenuLinkColor;
$mainMenuLinkBackgroundHoverColor: transparent; //$bgInverseHoverColor;
$mainMenuLinkHoverColor: $textPrimaryHoverColor;
@import '../../../_shared/styles/main-menu';

16
resources/www/prod/skins/ui-components/_modal-edit.scss
View File

@@ -129,6 +129,20 @@
padding: 2px;
margin-right: 10px;
position: relative;
.icon-stack {
font-size: 11px;
cursor: pointer;
width: 19px;
height: 15px;
line-height: 14px;
.icon-stack-base {
color: #777777; //darken($darkerBackgroundColor, 10);
}
.icon-light {
color: $darkerBackgroundColor; //$darkerTextColor;
}
}
}
div.edit_field.odd {
background-color: $darkBackgroundColor;
@@ -468,7 +482,7 @@ div.thesaurus {
left: 10px;
right: 10px;
margin-top: 21px;
border-top: 1px solid $workzoneTabBorderTop;
border-top: 1px solid $workzoneTabTopBorder;
border-radius: 0;
height: 43px;
border-bottom: 1px solid $workzoneTabBorderBottom;

4
resources/www/prod/skins/ui-components/_pagination.scss
View File

@@ -1,3 +1,4 @@
$paginationLinkColor: $linkDefaultColor !default;
#tool_navigate input {
text-align: center;
@@ -12,6 +13,7 @@
line-height: 14px;
font-weight: bold;
cursor: pointer;
color: $paginationLinkColor
}
@@ -84,7 +86,7 @@
font-weight: normal;
text-shadow: none;
box-shadow: none;
color: $paginateBorderColor;
color: $paginationLinkColor;
}
#paginate #tool_navigate:first-child {

10
resources/www/prod/skins/ui-components/_workzone-baskets.scss
View File

@@ -1,15 +1,17 @@
#idFrameC {
#baskets {
top: $tabHeight !important;
border-top: 1px solid $darkBorderColor;
> div {
border-top: 1px solid $mediumBorderColor;
// border-top: 1px solid $mediumBorderColor;
}
.bloc {
position: absolute;
top: 31px;
left: 0pt;
top: 0;
left: 0;
right: 1px;
bottom: 0px;
bottom: 0;
overflow-y: auto;
overflow-x: hidden;
&.groupDrop {

20
resources/www/prod/skins/ui-components/_workzone-proposals.scss
View File

@@ -1,10 +1,15 @@
$proposalsTitleColor: $darkerTextColor !default;
$proposalsTitleHoverColor: $darkerTextHoverColor !default;
$proposalsContentTextColor: $darkerTextColor !default;
$proposalsContentTextColor: $darkerTextColor !default;
/******* PROPOSALS ************************************************************/
#proposals {
position: relative;
left: 5px;
border-top: 1px solid $darkBorderColor;
top: 87px !important;
top: $tabHeight !important;
*:focus {
outline: none;
}
@@ -44,6 +49,8 @@
}
.fancytree-folder {
font-weight: bold;
font-size: $xmediumFontSize;
color: $proposalsTitleColor;
height: 49px;
line-height: 49px;
margin-left: 0;
@@ -80,6 +87,7 @@
}
}
.fancytree-expander {
position: absolute;
right: 10px;
@@ -94,11 +102,19 @@
.fancytree-title {
font-size: $xmediumFontSize;
color: $proposalsTitle;
color: $proposalsTitleColor;
background-color: transparent;
border: 0px none transparent;
}
.fancytree-node {
font-size: $xmediumFontSize;
color: $proposalsContentTextColor;
//background-color: transparent;
//border: 0px none transparent;
cursor: pointer;
}
.facetFilter {
font-weight: normal;
position: absolute;

16
resources/www/prod/skins/ui-components/_workzone-thesaurus.scss
View File

@@ -1,4 +1,4 @@
$thesaurusTabHeight: $subTabHeight !default;
.treeview {
li {
@@ -82,7 +82,8 @@ dans l'onglet thesaurus : arbres, menus contextuels
===================================== */
.ui-tabs {
#thesaurus_tab {
top: 87px !important;
top: $tabHeight !important;
border-top: 1px solid $darkBorderColor;
}
}
@@ -95,14 +96,16 @@ dans l'onglet thesaurus : arbres, menus contextuels
color: $textPrimaryColor;
}
&.th_tab {
height: 43px;
height: $thesaurusTabHeight; // in order to display bottom border
margin: 0;
border-bottom: 1px solid transparent;
box-sizing: border-box;
.ui-state-active {
border-bottom: 1px solid $thesaurusColor;
}
a {
height: 43px;
line-height: 43px;
height: $thesaurusTabHeight;
line-height: $thesaurusTabHeight;
vertical-align: middle;
margin: 0;
padding: 0 20px;
@@ -200,7 +203,8 @@ dans l'onglet thesaurus : arbres, menus contextuels
vertical-align: middle;
padding: 0;
border-radius: 0;
background: $mediumBackgroundColor url('#{$iconsPath}icon_magnify.png') 50% no-repeat;
background-color: $mediumBackgroundColor;
color: $mediumTextColor;
border: none;
margin: 0;
outline: none;

48
resources/www/prod/skins/ui-components/_workzone.scss
View File

@@ -1,3 +1,23 @@
$workzoneBackgroundColor: $darkBackgroundColor !default; //$mediumBackgroundColor !default;
$workzoneTopBorder: none !default;
$workzoneTabTopBorder: 1px solid $darkBorderColor !default;
$workzoneBorderTopColor: $mediumBorderColor !default;
$tabHeight: 86px !default;
$subTabHeight: 46px !default;
$workzoneTabContentBackgroundColor: $workzoneBackgroundColor !default;
$workzoneTabBackgroundColor: $workzoneBackgroundColor !default;
$workzoneTabTextColor: $mediumTextColor !default;
$workzoneTabActiveBackgroundColor: $tabContentBackgroundColor !default;
$workzoneTabActiveTextColor: $lightTextColor !default;
$workzoneTabDisabledBackgroundColor: $tabBackgroundColor !default;
$workzoneTabDisabledTextColor: $mediumTextActiveColor !default;
/**
* Workzone
*/
@@ -7,9 +27,6 @@
bottom: 0 !important;
&.closed {
min-width: 0;
#retractableButton {
background: url('#{$iconsPath}workzoneEscamote_on.png') 30px 30px no-repeat;
}
}
#retractableButton {
cursor: pointer;
@@ -17,14 +34,17 @@
height: 85px;
float: right;
text-align: center;
line-height: 70px;
line-height: 85px;
margin-bottom: -20px;
background: url('#{$iconsPath}workzoneEscamote.png') 30px 36px no-repeat;
i {
font-size: 23px;
color: $mediumTextColor;
}
}
.wrapper {
background-color: $mediumBackgroundColor;
background-color: $workzoneBackgroundColor;
right: 10px;
border-top: 1px solid $mediumBorderColor; //$workzoneBorderTop;
border-top: $workzoneTopBorder; //$workzoneBorderTop;
}
.ui-tabs {
@@ -36,23 +56,25 @@
margin: 0;
padding: 0;
.ui-tabs-nav {
background-color: transparent;
background-color: $workzoneTabContentBackgroundColor;
top: 0;
left: 10px;
right: 10px;
//margin-top: 21px;
border-top: 1px solid $workzoneTabBorderTop;
// border-top: 1px solid $workzoneTabTopBorder;
border-radius: 0;
height: 43px;
height: $subTabHeight;
border-bottom: 1px solid $workzoneTabBorderBottom;
box-sizing: border-box;
li {
width: auto;
height: 85px;
height: $tabHeight;
display: inline-block;
background-color: $mediumBackgroundColor;
background-color: $workzoneTabBackgroundColor;
z-index: 10;
border-radius: 0;
margin: 0;
box-sizing: border-box;
&.proposals_WZ {
&.ui-state-active {
a {
@@ -96,7 +118,7 @@
a {
background-color: $workzoneTabBgActive;
border-bottom: 1px solid $thesaurusColor;
height: 82px;
// height: 82px;
}
}
}

1
resources/www/vendors/bootstrap/bootstrap.scss vendored
View File

@@ -61,3 +61,4 @@
// Utility classes
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/utilities"; // Has to be last to override when necessary
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-utilities";

8
templates/web/admin/editusers.html.twig
View File

@@ -553,8 +553,8 @@
</div>
{% endif %}
</div>
<div class="PNB10" style="top:auto;height:20px;">
<button class="users_rights_valid btn">{{ 'boutton::valider' | trans }}</button>
<div class="form-actions" style="">
<button class="users_rights_valid btn btn-primary">{{ 'boutton::valider' | trans }}</button>
<a href="{{ path('admin_users_search') }}" class="users_rights_cancel btn" style="text-decoration:none">{{ 'boutton::retour' | trans }}</a>
</div>
</div>
@@ -1109,10 +1109,6 @@
"server": "{{ app['geonames.server-uri'] }}",
"limit": 40
});
/*console.log(geocompleter);
geocompleter.autocompleter("on", "geotocompleter.request.error", function(jqXhr, status, error) {
console.log('has failed', jqXhr, status, error );
});*/
});

2
templates/web/admin/subdefs.html.twig
View File

@@ -169,7 +169,7 @@
{% block content %}
<p>
<button id="create-subdef" class="btn btn-warning">{{ 'Create new subdef' | trans }}</button>
<button id="create-subdef" class="btn btn-success">{{ 'Create new subdef' | trans }}</button>
</p>
<div id="dialog-delete-subdef" title="{{ 'Delete the subdef ?' | trans }}" style="display:none;">
<p>

54
templates/web/admin/task-manager/task-editor/task.html.twig
View File

@@ -1,23 +1,7 @@
<div id="taskBody">
{% block css %}{% endblock %}
<div>
<form
name="task-edit"
method="POST"
action="{{ path('admin_tasks_task_save', {'task' : task.getId()}) }}"
class="form-inline no-ajax"
>
{% if form.vars.errors|length > 0 %}
{{ form_errors(form) }}
{% endif %}
{{ form_rest(form) }}
<a href="{{ path('admin_tasks_list') }}">{{ 'Cancel' | trans }}</a>
<button type="submit" class="btn btn-success btn-trigger " id="taskSaveButton">
{{ "Save" | trans }}
</button>
</form>
<div>
{{ 'admin::tasks: Nombre de crashes :' | trans }} <span id="crash-counter">{{ task.getCrashed() }}</span>
@@ -47,6 +31,27 @@
{% endblock %}
</div>
</div>
<form
name="task-edit"
method="POST"
action="{{ path('admin_tasks_task_save', {'task' : task.getId()}) }}"
class="form-inline no-ajax"
>
{% if form.vars.errors|length > 0 %}
{{ form_errors(form) }}
{% endif %}
{{ form_rest(form) }}
<div class="form-actions">
<button type="submit" class="btn btn-primary btn-trigger " id="taskSaveButton">
{{ "Save" | trans }}
</button>
<a href="{{ path('admin_tasks_list') }}">{{ 'Cancel' | trans }}</a>
</div>
</form>
{% block javascript %}
<script type="text/javascript">
@@ -148,7 +153,22 @@
, async:false
, success:function(data) {
if (data.success) {
loadRightAjax("{{ path('admin_tasks_list') }}");
console.log('should go back to list');
//loadRightAjax("{{ path('admin_tasks_list') }}");
/* var $this = $(this);
$('#right-ajax').empty().addClass('loading').parent().show();
$('#right').hide();
$.get($this.attr('href'), function (data) {
$('#right-ajax').removeClass('loading').html(data);
});
return false;
*/
} else {
if (window.console) {
console.log(data.message);

1
templates/web/prod/actions/Tools/index.html.twig
View File

@@ -341,6 +341,7 @@
name="uploadHdsub"
height="0"
width="0"
border="0"
>
</iframe>
</div>

15
templates/web/prod/actions/edit_default.html.twig
View File

@@ -39,9 +39,13 @@
<div style='position:absolute; top:0px; left:0px; height:20px'>
<img class="require_alert" src="/assets/common/images/icons/alert.png" style="display:none;cursor:help;" title="{{ 'edit::Certains champs doivent etre remplis pour valider cet editing' | trans }}">
</div>
<div style='position:absolute; bottom:0px; left:0px; height:20px'>
<div style='position:absolute; bottom:0px; left:0px; height:20px' class="bottom actions">
<div class="previewTips" tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}"></div>
<img class="infoTips" tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}" src="/assets/common/images/icons/info.gif"/>
<span class="icon-stack infoTips" tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-info icon-light"></i>
</span>
</div>
<div class="reg_opts" style="display:none;position:absolute;bottom:0;right:0;">
<a style="float:right;padding:0;margin:0;cursor:pointer;" class="contextMenuTrigger" id="editContextTrigger_{{ record.get_serialize_key() }}">&#9660;</a>
@@ -78,8 +82,11 @@
{% set i = field.get_id() %}
{% if field.is_readonly() is empty %}
<div class="edit_field" id="EditFieldBox_{{i}}" onclick="return(edit_mdwn_fld(event, {{i}}, '{{field.get_name()}}'));" >
<img id="editSGtri_{{i}}" style="visibility:hidden;" src="/assets/prod/skins/{{cssfile}}/images/suggested.gif" />
<img src="/assets/common/images/icons/info.gif" tooltipsrc="{{ path('prod_tooltip_metadata', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}" class="fieldTips" alt=""/>
<i id="editSGtri_{{i}}" style="visibility:hidden;" class="icon-caret-right"></i>
<span class="icon-stack fieldTips" tooltipsrc="{{ path('prod_tooltip_metadata', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-info icon-light"></i>
</span>
{% if field.get_dces_element %}
<img src="/assets/common/images/icons/dublincore.png" tooltipsrc="{{ path('prod_tooltip_dces', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}" alt="{{ 'Ce champ est decrit comme un element DublinCore' | trans }}" class="DCESTips" />
{% endif %}

11
templates/web/prod/index.html.twig
View File

@@ -108,7 +108,7 @@
<div class="PNB wrapper">
<div class="tabs ui-tabs">
{% block tabs_panel %}
<div id="retractableButton"></div>
<div id="retractableButton"><i class="icon-double-angle-left"></i></div>
{% include 'prod/tab_headers.html.twig' %}
<div id="baskets" class="PNB">
{% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %}
@@ -631,7 +631,7 @@
</div>
</div>
<div id="PREVIEWBOX" class="PNB10" style="overflow:hidden;">
<div id="PREVIEWBOX" class="PNB10 ui-dialog " style="overflow:hidden;">
<div class="PNB" style="right:180px;">
<div id="PREVIEWTITLE" style="height:55px;bottom:auto;" class="PNB">
<div class="PNB10 ui-corner-top" id='PREVIEWTITLEWRAPPER'>
@@ -680,9 +680,10 @@
</div>
<div class="PNB" style="width:180px;left:auto;">
<div class="PNB10 ui-corner-all" style="height:20px;">
<div onclick="closePreview();" style="cursor:pointer;color:#CCCCCC;font-size:14px;font-weight:bold;text-align:center;text-decoration:underline;">
{{ 'boutton::fermer' | trans }}
</div>
<button type="button" onclick="closePreview();" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-icon-only ui-dialog-titlebar-close" role="button" aria-disabled="false" title="close">
<span class="ui-button-icon-primary ui-icon ui-icon-closethick"></span><span class="ui-button-text">close</span>
</button>
</div>
<div id="PREVIEWOTHERS" style="top:40px;" class="PNB10 ui-corner-all">
<div id="PREVIEWOTHERSINNER" style=""></div>

15
templates/web/prod/preview/appears_in.html.twig
View File

@@ -18,7 +18,20 @@
{% for basket in baskets %}
<li onclick="openPreview('BASK',0,'{{basket.getId()}}',true); return(false);"
class="otherBaskToolTip" title="{{basket.getDescription()}}">
<img style="vertical-align:middle;" title="" src="/assets/common/images/icons/basket.gif"/>
{#<img style="vertical-align:middle" src="/assets/common/images/icons/basket.png" width="16">#}
{% if basket.getValidation() %}
<img src='/assets/common/images/icons/basket_validation.png' title='' width="16" class="btn-image"/>
{% elseif basket.getPusher() %}
{% if not basket.getIsRead() %}
<img src='/assets/common/images/icons/basket_push_unread.png' title='' width="16" class="btn-image"/>
{% else %}
<img src='/assets/common/images/icons/basket_push.png' title='' width="16" class="btn-image"/>
{% endif %}
{% else %}
<img src='/assets/common/images/icons/basket.png' title='' width="16" class="btn-image"/>
{% endif %}
<span class="title">{{basket.getName()}}</span>
</li>
{% endfor %}

2
templates/web/prod/preview/caption.html.twig
View File

@@ -6,7 +6,7 @@
{% if can_edit %}
<div class="edit_button" style="text-align:right">
<a href="#" onclick="editThis('IMGT','{{ record.get_serialize_key }}');">
<img style="vertical-align:middle" src="/assets/common/images/icons/ppen_history.png" width="16"/>
<img style="vertical-align:middle" src="/assets/common/images/icons/ppen_history.png" width="16" class="btn-image"/>
{{ 'action : editer' | trans }}
</a>
</div>

19
templates/web/prod/preview/tools.html.twig
View File

@@ -2,22 +2,29 @@
{% if (record.is_from_basket is empty) and app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(record.get_base_id(), 'canputinalbum') %}
<div sbas="{{record.get_sbas_id()}}" id="PREV_BASKADD_{{record.get_serialize_key}}"
class="baskAdder" title="{{ 'action : ajouter au panier' | trans }}"
onclick="evt_add_in_chutier('{{record.get_sbas_id()}}','{{record.get_record_id()}}',false,this);return(false);"></div>
onclick="evt_add_in_chutier('{{record.get_sbas_id()}}','{{record.get_record_id()}}',false,this);return(false);">
<img src="/assets/common/images/icons/basket.png" height="16" width="16" class="btn-image">
</div>
{% endif %}
{% if record.is_from_basket() %}
<a sbas="{{record.get_sbas_id()}}" id="PREV_BASKDEL_{{record.get_serialize_key}}"
class="baskDeleter WorkZoneElementRemover" title="{{ 'Remove from basket' | trans }}"
class="WorkZoneElementRemover"
data-context="reg_train_basket"
onclick="remove_from_basket($(this), false);return false;"
href="{{ path('prod_baskets_basket_element_remove', { 'basket' : record.get_container().getId(), 'basket_element_id' : record.get_original_item().getId()}) }}">
<img src="/assets/common/images/icons/delete.png" height="16" width="16" class="btn-image" title="{{ 'Remove from basket' | trans }}">
</a>
{% endif %}
<div class="printer" title="'{{ 'action : print' | trans }}"
onclick="evt_print('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);"></div>
<div onclick="evt_print('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);">
<img src="/assets/common/images/icons/print_history.png" height="16" width="16" class="btn-image" title="'{{ 'action : print' | trans }}">
</div>
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(record.get_base_id(), 'candwnldhd') or app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(record.get_base_id(), 'candwnldpreview') %}
<div class="downloader" title="{{ 'action : exporter' | trans }}"
onclick="evt_dwnl('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);"></div>
<div onclick="evt_dwnl('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);">
<img src="/assets/common/images/icons/disktt_history.png" height="16" width="16" class="btn-image" title="{{ 'action : exporter' | trans }}">
{# <img style="vertical-align:middle" src="/assets/common/images/icons/basket.png" width="16">#}
</div>
{% endif %}

57
templates/web/prod/results/record.html.twig
View File

@@ -50,7 +50,7 @@
</div>
</div>
<div style="height: 25px; position:relative; text-align:left;">
<table class="bottom" style="width:100%; table-layout:fixed;">
<table class="bottom actions" style="width:100%; table-layout:fixed;">
<tr>
<td style="text-align:left;text-overflow:ellipsis;overflow:hidden;">
{{ record.collectionName }}
@@ -67,10 +67,49 @@
{# drop down options #}
<td style='text-align:right;width:{{l_width}}px;' valign='bottom'>
<a style="float:right;padding:0;cursor:pointer;" class="contextMenuTrigger" id="contextTrigger_{{record.id}}">
{#<a style="float:right;padding:0;cursor:pointer;" class="contextMenuTrigger" id="contextTrigger_{{record.id}}">
<img src="/assets/common/images/icons/contextMenuTrigger.png" height="10" />
<i class="icon-caret-down"></i>
</a>
</a>#}
{% if record.subdefs.preview is defined and has_access_subdef(record, 'preview') %}
<span class="icon-stack previewTips"
tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}" class="previewTips"
>
<i class="icon-circle icon-stack-base"></i>
<i class="icon-search icon-light"></i>
</span>
{#<div tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}" class="previewTips"></div>#}
{% endif %}
{% if settings.rollover_thumbnail == 'preview' %}
<span class="icon-stack captionRolloverTips" tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId, 'context' : 'answer', 'number' : record.position|default(0) }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-list icon-light"></i>
</span>
{% endif %}
{% if settings.technical_display == '1' %}
{#<img
class="infoTips"
tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}" src="/assets/common/images/icons/info.gif"/>#}
<span class="icon-stack infoTips" tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-info icon-light"></i>
</span>
{% endif %}
<span class="icon-stack contextMenuTrigger" id="contextTrigger_{{record.id}}"
tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-ellipsis-horizontal icon-light"></i>
</span>
<table cellspacing="0" cellpadding="0" style="display:none;" id="answerContext_{{record.id}}" class="contextMenu answercontextmenu">
<tbody>
<tr>
@@ -115,18 +154,6 @@
</tr>
</tbody>
</table>
{% if record.subdefs.preview is defined and has_access_subdef(record, 'preview') %}
<div tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}" class="previewTips"></div>
{% endif %}
{% if settings.rollover_thumbnail == 'preview' %}
<div tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId, 'context' : 'answer', 'number' : record.position|default(0) }) }}" class="captionRolloverTips"></div>
{% endif %}
{% if settings.technical_display == '1' %}
<img class="infoTips" tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}" src="/assets/common/images/icons/info.gif"/>
{% endif %}
</td>
</tr>
</table>

5
templates/web/prod/tab_thesaurus.html.twig
View File

@@ -23,7 +23,10 @@
<div class="input-append">
<input type="text" name="search_value" class="input-medium"
onkeyup="T_Gfilter_delayed(this.value, 300);"/>
<input type="submit" class="th_ok btn" value=""/>
<button type="submit" class="th_ok btn btn-inverse">
<i class="icon-search"></i>
</button>
<input type="button" class="th_clear"/>
<input type="button" class="th_cancel btn" value="{{ 'boutton::annuler' | trans }}"
onclick="thesauCancelWizard();return(false);"/>

2
www/scripts/apps/admin/tasks-manager/views/scheduler.js
View File

@@ -54,7 +54,7 @@ define([
if(url && url.indexOf('#') !== 0) {
// This is defined in admin/index.html.twig
window.loadRightAjax(url, link.attr("method") || "GET");
// window.loadRightAjax(url, link.attr("method") || "GET");
}
}
});