diff --git a/app/assets/images/admin/file_types/_blank.png b/app/assets/images/admin/file_types/_blank.png new file mode 100755 index 0000000..ceebb42 Binary files /dev/null and b/app/assets/images/admin/file_types/_blank.png differ diff --git a/app/assets/images/admin/file_types/_page.png b/app/assets/images/admin/file_types/_page.png new file mode 100755 index 0000000..349e29f Binary files /dev/null and b/app/assets/images/admin/file_types/_page.png differ diff --git a/app/assets/images/admin/file_types/aac.png b/app/assets/images/admin/file_types/aac.png new file mode 100755 index 0000000..a0720ca Binary files /dev/null and b/app/assets/images/admin/file_types/aac.png differ diff --git a/app/assets/images/admin/file_types/ai.png b/app/assets/images/admin/file_types/ai.png new file mode 100755 index 0000000..25428c7 Binary files /dev/null and b/app/assets/images/admin/file_types/ai.png differ diff --git a/app/assets/images/admin/file_types/aiff.png b/app/assets/images/admin/file_types/aiff.png new file mode 100755 index 0000000..c4adb94 Binary files /dev/null and b/app/assets/images/admin/file_types/aiff.png differ diff --git a/app/assets/images/admin/file_types/avi.png b/app/assets/images/admin/file_types/avi.png new file mode 100755 index 0000000..6ccb586 Binary files /dev/null and b/app/assets/images/admin/file_types/avi.png differ diff --git a/app/assets/images/admin/file_types/bmp.png b/app/assets/images/admin/file_types/bmp.png new file mode 100755 index 0000000..98ef182 Binary files /dev/null and b/app/assets/images/admin/file_types/bmp.png differ diff --git a/app/assets/images/admin/file_types/c.png b/app/assets/images/admin/file_types/c.png new file mode 100755 index 0000000..1134bd2 Binary files /dev/null and b/app/assets/images/admin/file_types/c.png differ diff --git a/app/assets/images/admin/file_types/cpp.png b/app/assets/images/admin/file_types/cpp.png new file mode 100755 index 0000000..cbf4db5 Binary files /dev/null and b/app/assets/images/admin/file_types/cpp.png differ diff --git a/app/assets/images/admin/file_types/css.png b/app/assets/images/admin/file_types/css.png new file mode 100755 index 0000000..1d2ee26 Binary files /dev/null and b/app/assets/images/admin/file_types/css.png differ diff --git a/app/assets/images/admin/file_types/dat.png b/app/assets/images/admin/file_types/dat.png new file mode 100755 index 0000000..8623145 Binary files /dev/null and b/app/assets/images/admin/file_types/dat.png differ diff --git a/app/assets/images/admin/file_types/dmg.png b/app/assets/images/admin/file_types/dmg.png new file mode 100755 index 0000000..3fc2e36 Binary files /dev/null and b/app/assets/images/admin/file_types/dmg.png differ diff --git a/app/assets/images/admin/file_types/doc.png b/app/assets/images/admin/file_types/doc.png new file mode 100755 index 0000000..cdfcf6c Binary files /dev/null and b/app/assets/images/admin/file_types/doc.png differ diff --git a/app/assets/images/admin/file_types/dotx.png b/app/assets/images/admin/file_types/dotx.png new file mode 100755 index 0000000..6b52dd1 Binary files /dev/null and b/app/assets/images/admin/file_types/dotx.png differ diff --git a/app/assets/images/admin/file_types/dwg.png b/app/assets/images/admin/file_types/dwg.png new file mode 100755 index 0000000..2e82182 Binary files /dev/null and b/app/assets/images/admin/file_types/dwg.png differ diff --git a/app/assets/images/admin/file_types/dxf.png b/app/assets/images/admin/file_types/dxf.png new file mode 100755 index 0000000..18abb2a Binary files /dev/null and b/app/assets/images/admin/file_types/dxf.png differ diff --git a/app/assets/images/admin/file_types/eps.png b/app/assets/images/admin/file_types/eps.png new file mode 100755 index 0000000..41fc8dc Binary files /dev/null and b/app/assets/images/admin/file_types/eps.png differ diff --git a/app/assets/images/admin/file_types/exe.png b/app/assets/images/admin/file_types/exe.png new file mode 100755 index 0000000..7bee6e2 Binary files /dev/null and b/app/assets/images/admin/file_types/exe.png differ diff --git a/app/assets/images/admin/file_types/flv.png b/app/assets/images/admin/file_types/flv.png new file mode 100755 index 0000000..ceba637 Binary files /dev/null and b/app/assets/images/admin/file_types/flv.png differ diff --git a/app/assets/images/admin/file_types/gif.png b/app/assets/images/admin/file_types/gif.png new file mode 100755 index 0000000..8d47b3a Binary files /dev/null and b/app/assets/images/admin/file_types/gif.png differ diff --git a/app/assets/images/admin/file_types/h.png b/app/assets/images/admin/file_types/h.png new file mode 100755 index 0000000..8c3accc Binary files /dev/null and b/app/assets/images/admin/file_types/h.png differ diff --git a/app/assets/images/admin/file_types/hpp.png b/app/assets/images/admin/file_types/hpp.png new file mode 100755 index 0000000..a524529 Binary files /dev/null and b/app/assets/images/admin/file_types/hpp.png differ diff --git a/app/assets/images/admin/file_types/html.png b/app/assets/images/admin/file_types/html.png new file mode 100755 index 0000000..abd1aaa Binary files /dev/null and b/app/assets/images/admin/file_types/html.png differ diff --git a/app/assets/images/admin/file_types/ics.png b/app/assets/images/admin/file_types/ics.png new file mode 100755 index 0000000..2be146d Binary files /dev/null and b/app/assets/images/admin/file_types/ics.png differ diff --git a/app/assets/images/admin/file_types/iso.png b/app/assets/images/admin/file_types/iso.png new file mode 100755 index 0000000..fbe5a0c Binary files /dev/null and b/app/assets/images/admin/file_types/iso.png differ diff --git a/app/assets/images/admin/file_types/java.png b/app/assets/images/admin/file_types/java.png new file mode 100755 index 0000000..fe608bf Binary files /dev/null and b/app/assets/images/admin/file_types/java.png differ diff --git a/app/assets/images/admin/file_types/jpg.png b/app/assets/images/admin/file_types/jpg.png new file mode 100755 index 0000000..f04374f Binary files /dev/null and b/app/assets/images/admin/file_types/jpg.png differ diff --git a/app/assets/images/admin/file_types/key.png b/app/assets/images/admin/file_types/key.png new file mode 100755 index 0000000..07695ec Binary files /dev/null and b/app/assets/images/admin/file_types/key.png differ diff --git a/app/assets/images/admin/file_types/mid.png b/app/assets/images/admin/file_types/mid.png new file mode 100755 index 0000000..6244336 Binary files /dev/null and b/app/assets/images/admin/file_types/mid.png differ diff --git a/app/assets/images/admin/file_types/mp3.png b/app/assets/images/admin/file_types/mp3.png new file mode 100755 index 0000000..523bd79 Binary files /dev/null and b/app/assets/images/admin/file_types/mp3.png differ diff --git a/app/assets/images/admin/file_types/mp4.png b/app/assets/images/admin/file_types/mp4.png new file mode 100755 index 0000000..68a4404 Binary files /dev/null and b/app/assets/images/admin/file_types/mp4.png differ diff --git a/app/assets/images/admin/file_types/mpg.png b/app/assets/images/admin/file_types/mpg.png new file mode 100755 index 0000000..64e72e7 Binary files /dev/null and b/app/assets/images/admin/file_types/mpg.png differ diff --git a/app/assets/images/admin/file_types/odf.png b/app/assets/images/admin/file_types/odf.png new file mode 100755 index 0000000..4739952 Binary files /dev/null and b/app/assets/images/admin/file_types/odf.png differ diff --git a/app/assets/images/admin/file_types/ods.png b/app/assets/images/admin/file_types/ods.png new file mode 100755 index 0000000..5f09b0c Binary files /dev/null and b/app/assets/images/admin/file_types/ods.png differ diff --git a/app/assets/images/admin/file_types/odt.png b/app/assets/images/admin/file_types/odt.png new file mode 100755 index 0000000..607bae5 Binary files /dev/null and b/app/assets/images/admin/file_types/odt.png differ diff --git a/app/assets/images/admin/file_types/otp.png b/app/assets/images/admin/file_types/otp.png new file mode 100755 index 0000000..655bc83 Binary files /dev/null and b/app/assets/images/admin/file_types/otp.png differ diff --git a/app/assets/images/admin/file_types/ots.png b/app/assets/images/admin/file_types/ots.png new file mode 100755 index 0000000..c59ad95 Binary files /dev/null and b/app/assets/images/admin/file_types/ots.png differ diff --git a/app/assets/images/admin/file_types/ott.png b/app/assets/images/admin/file_types/ott.png new file mode 100755 index 0000000..18dd9fa Binary files /dev/null and b/app/assets/images/admin/file_types/ott.png differ diff --git a/app/assets/images/admin/file_types/pdf.png b/app/assets/images/admin/file_types/pdf.png new file mode 100755 index 0000000..0f8a3e1 Binary files /dev/null and b/app/assets/images/admin/file_types/pdf.png differ diff --git a/app/assets/images/admin/file_types/php.png b/app/assets/images/admin/file_types/php.png new file mode 100755 index 0000000..144b543 Binary files /dev/null and b/app/assets/images/admin/file_types/php.png differ diff --git a/app/assets/images/admin/file_types/png.png b/app/assets/images/admin/file_types/png.png new file mode 100755 index 0000000..0043d8b Binary files /dev/null and b/app/assets/images/admin/file_types/png.png differ diff --git a/app/assets/images/admin/file_types/ppt.png b/app/assets/images/admin/file_types/ppt.png new file mode 100755 index 0000000..ef39540 Binary files /dev/null and b/app/assets/images/admin/file_types/ppt.png differ diff --git a/app/assets/images/admin/file_types/psd.png b/app/assets/images/admin/file_types/psd.png new file mode 100755 index 0000000..c1fad7c Binary files /dev/null and b/app/assets/images/admin/file_types/psd.png differ diff --git a/app/assets/images/admin/file_types/py.png b/app/assets/images/admin/file_types/py.png new file mode 100755 index 0000000..892dda1 Binary files /dev/null and b/app/assets/images/admin/file_types/py.png differ diff --git a/app/assets/images/admin/file_types/qt.png b/app/assets/images/admin/file_types/qt.png new file mode 100755 index 0000000..db94f79 Binary files /dev/null and b/app/assets/images/admin/file_types/qt.png differ diff --git a/app/assets/images/admin/file_types/rar.png b/app/assets/images/admin/file_types/rar.png new file mode 100755 index 0000000..a0d3b94 Binary files /dev/null and b/app/assets/images/admin/file_types/rar.png differ diff --git a/app/assets/images/admin/file_types/rb.png b/app/assets/images/admin/file_types/rb.png new file mode 100755 index 0000000..edadadc Binary files /dev/null and b/app/assets/images/admin/file_types/rb.png differ diff --git a/app/assets/images/admin/file_types/rtf.png b/app/assets/images/admin/file_types/rtf.png new file mode 100755 index 0000000..b735802 Binary files /dev/null and b/app/assets/images/admin/file_types/rtf.png differ diff --git a/app/assets/images/admin/file_types/sql.png b/app/assets/images/admin/file_types/sql.png new file mode 100755 index 0000000..0664ed5 Binary files /dev/null and b/app/assets/images/admin/file_types/sql.png differ diff --git a/app/assets/images/admin/file_types/tga.png b/app/assets/images/admin/file_types/tga.png new file mode 100755 index 0000000..fb6ad73 Binary files /dev/null and b/app/assets/images/admin/file_types/tga.png differ diff --git a/app/assets/images/admin/file_types/tgz.png b/app/assets/images/admin/file_types/tgz.png new file mode 100755 index 0000000..d99d6d6 Binary files /dev/null and b/app/assets/images/admin/file_types/tgz.png differ diff --git a/app/assets/images/admin/file_types/tiff.png b/app/assets/images/admin/file_types/tiff.png new file mode 100755 index 0000000..8b90725 Binary files /dev/null and b/app/assets/images/admin/file_types/tiff.png differ diff --git a/app/assets/images/admin/file_types/txt.png b/app/assets/images/admin/file_types/txt.png new file mode 100755 index 0000000..26909be Binary files /dev/null and b/app/assets/images/admin/file_types/txt.png differ diff --git a/app/assets/images/admin/file_types/wav.png b/app/assets/images/admin/file_types/wav.png new file mode 100755 index 0000000..9079924 Binary files /dev/null and b/app/assets/images/admin/file_types/wav.png differ diff --git a/app/assets/images/admin/file_types/xls.png b/app/assets/images/admin/file_types/xls.png new file mode 100755 index 0000000..67c7708 Binary files /dev/null and b/app/assets/images/admin/file_types/xls.png differ diff --git a/app/assets/images/admin/file_types/xlsx.png b/app/assets/images/admin/file_types/xlsx.png new file mode 100755 index 0000000..4e83448 Binary files /dev/null and b/app/assets/images/admin/file_types/xlsx.png differ diff --git a/app/assets/images/admin/file_types/xml.png b/app/assets/images/admin/file_types/xml.png new file mode 100755 index 0000000..8bdd012 Binary files /dev/null and b/app/assets/images/admin/file_types/xml.png differ diff --git a/app/assets/images/admin/file_types/yml.png b/app/assets/images/admin/file_types/yml.png new file mode 100755 index 0000000..1b5c7b8 Binary files /dev/null and b/app/assets/images/admin/file_types/yml.png differ diff --git a/app/assets/images/admin/file_types/zip.png b/app/assets/images/admin/file_types/zip.png new file mode 100755 index 0000000..db988ad Binary files /dev/null and b/app/assets/images/admin/file_types/zip.png differ diff --git a/app/assets/javascripts/note_files/note_files.js b/app/assets/javascripts/note_files/note_files.js index a52abe8..4659568 100644 --- a/app/assets/javascripts/note_files/note_files.js +++ b/app/assets/javascripts/note_files/note_files.js @@ -8,11 +8,14 @@ function init_note_upload_fields(note_id){ autoUpload: true, progressall: function (e, data) { var progress = parseInt(data.loaded / data.total * 100, 10); - - $(this).find('.progress .bar').html(progress + '% téléchargé.'); + if(progress == 100){ + $(this).find('.progress').html('traitement en cours.'); + } + else{ + $(this).find('.progress').html(progress + '% téléchargé.');} }, always: function (e, data) { - $(this).find('.progress .bar').html(""); + $(this).find('.progress').html(""); }, drop: function (e, data) { @@ -32,12 +35,19 @@ function init_note_upload_fields(note_id){ }); + + + } $(document).ready(function () { - + $(".note .add_file").live("click",function(){ + + $(this).next('input').click(); + return false; + }); }); diff --git a/app/assets/stylesheets/admin.css.scss b/app/assets/stylesheets/admin.css.scss index 50c481f..9f0d1a0 100644 --- a/app/assets/stylesheets/admin.css.scss +++ b/app/assets/stylesheets/admin.css.scss @@ -43,6 +43,82 @@ +body { + -webkit-font-smoothing: antialiased; + width:100%; + font-size: 13px; + font-family: 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif; + padding: 0px; + margin: 0px; + + &.wysihtml5-editor{ + background:transparent; + } + +} + +#breadcrumb{ + padding:0px; + height:40px; + position:relative; + color:#FFFFFF; + background: #2E2E2E; + + *{ + color:#FFFFFF; + } + + nav{ + a{ + display:inline-block; + padding:13px; + } + } + + .personnal{ + width:140px; + float:right; + position:relative; + + span{ + display:inline-block; + top:-15px; + position:relative; + } + + .avatar{ + width:36px; + border-radius:50%; + margin:2px; + } + + .menu{ + display:none; + } + + &:hover{ + + .menu{ + display:block; + position:absolute; + z-index:1000; + top:40px; + background:#2E2E2E; + + a{ + display:block; + width:120px; + padding:10px 15px; + } + } + } + + } + +} + + + ol { &.code { @@ -64,117 +140,6 @@ ol { -/* Dashboard */ -#dashboard_menu{ - - - - a - { - - - float:left; - display:block; - - - margin:30px; - padding:10px; - - margin-bottom:20px; - - - @include background(linear-gradient(#FAFAFA, #EEE)); - @include border-radius(5px); - color:black; - - - background: white; - width: 200px; - padding: 10px; - margin: auto; - - position:relative; - - margin-left:20px; - - - - - &:before, - &:after { - content:""; - position:absolute; - z-index:-1; - bottom:15px; - left:10px; - width:50%; - height:20%; - max-width:300px; - - @include box-shadow(rgba(0, 0, 0, 0.7) 0 20px 15px ); - @include transform(rotate(-3deg)); - } - - &:after{ - right:10px; - left:auto; - @include transform(rotate(3deg)); - } - - - - - - display:block; - padding:15px; - - margin-bottom:20px; - - - - text-align:center; - color:black; - - img{ - display:block; - margin:auto; - height:100px; - } - - - - - &:hover{ - @include border-radius(5px 5px 12px 5px / 5px 5px 25px 5px); - @include background-image(linear-gradient(bottom right, #cccccc, white 10%,white)); - &:after{ - - - @include transform(rotate(10deg)); - - - } - - } - - - } - - - - - - - - - - - - - - - -} diff --git a/app/assets/stylesheets/admin/qi_core.css.scss b/app/assets/stylesheets/admin/qi_core.css.scss index 1cf2056..a2cb0cd 100644 --- a/app/assets/stylesheets/admin/qi_core.css.scss +++ b/app/assets/stylesheets/admin/qi_core.css.scss @@ -17,19 +17,7 @@ } -body { - -webkit-font-smoothing: antialiased; - width:100%; - font-size: 13px; - font-family: 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif; - padding: 0px; - margin: 0px; - - &.wysihtml5-editor{ - background:transparent; - } -} @@ -78,33 +66,13 @@ body { /* general.css */ + + + #menu_items_breadcrumbs .add_menu_item_link{ float:right; margin-top:2px; } -#breadcrumb{ - - padding:10px 10px 10px 10px; - position:relative; - color:#FFFFFF; - background: #2E2E2E; - - -} -#breadcrumb .logout_link{ - - position:absolute; - right:10px; - top:10px; - -} - - - -#breadcrumb *{ - color:#FFFFFF; - -} .main_slide{ @@ -439,352 +407,6 @@ a:hover{ color:#3F94EB; } -/* core/fluid_grid */ -/* - Variable Grid System (Fluid Version). - Learn more ~ http://www.spry-soft.com/grids/ - Based on 960 Grid System - http://960.gs/ & 960 Fluid - http://www.designinfluences.com/ - - Licensed under GPL and MIT. -*/ - - -/* Containers -----------------------------------------------------------------------------------------------------*/ -.container_12 { - width: 100%; -/* - margin-left: 4%; - margin-right: 4%; -*/ -} - -/* Grid >> Global -----------------------------------------------------------------------------------------------------*/ - -.grid_1, -.grid_2, -.grid_3, -.grid_4, -.grid_5, -.grid_6, -.grid_7, -.grid_8, -.grid_9, -.grid_10, -.grid_11, -.grid_12 { - display:inline; - float: left; - position: relative; - margin-left: 1%; - margin-right: 1%; -} - -/* Grid >> Children (Alpha ~ First, Omega ~ Last) -----------------------------------------------------------------------------------------------------*/ - -.alpha { - margin-left: 0; -} - -.omega { - margin-right: 0; -} - -/* Grid >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - - -.container_12 .grid_1 { - width:6.333%; -} - -.container_12 .grid_2 { - width:14.667%; -} - -.container_12 .grid_3 { - width:23.0%; -} - -.container_12 .grid_4 { - width:31.333%; -} - -.container_12 .grid_5 { - width:39.667%; -} - -.container_12 .grid_6 { - width:48.0%; -} - -.container_12 .grid_7 { - width:56.333%; -} - -.container_12 .grid_8 { - width:64.667%; -} - -.container_12 .grid_9 { - width:73.0%; -} - -.container_12 .grid_10 { - width:81.333%; -} - -.container_12 .grid_11 { - width:89.667%; -} - -.container_12 .grid_12 { - width:98.0%; -} - - - -/* Prefix Extra Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - - -.container_12 .prefix_1 { - padding-left:8.333%; -} - -.container_12 .prefix_2 { - padding-left:16.667%; -} - -.container_12 .prefix_3 { - padding-left:25.0%; -} - -.container_12 .prefix_4 { - padding-left:33.333%; -} - -.container_12 .prefix_5 { - padding-left:41.667%; -} - -.container_12 .prefix_6 { - padding-left:50.0%; -} - -.container_12 .prefix_7 { - padding-left:58.333%; -} - -.container_12 .prefix_8 { - padding-left:66.667%; -} - -.container_12 .prefix_9 { - padding-left:75.0%; -} - -.container_12 .prefix_10 { - padding-left:83.333%; -} - -.container_12 .prefix_11 { - padding-left:91.667%; -} - - - -/* Suffix Extra Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - - -.container_12 .suffix_1 { - padding-right:8.333%; -} - -.container_12 .suffix_2 { - padding-right:16.667%; -} - -.container_12 .suffix_3 { - padding-right:25.0%; -} - -.container_12 .suffix_4 { - padding-right:33.333%; -} - -.container_12 .suffix_5 { - padding-right:41.667%; -} - -.container_12 .suffix_6 { - padding-right:50.0%; -} - -.container_12 .suffix_7 { - padding-right:58.333%; -} - -.container_12 .suffix_8 { - padding-right:66.667%; -} - -.container_12 .suffix_9 { - padding-right:75.0%; -} - -.container_12 .suffix_10 { - padding-right:83.333%; -} - -.container_12 .suffix_11 { - padding-right:91.667%; -} - - - -/* Push Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - - -.container_12 .push_1 { - left:8.333%; -} - -.container_12 .push_2 { - left:16.667%; -} - -.container_12 .push_3 { - left:25.0%; -} - -.container_12 .push_4 { - left:33.333%; -} - -.container_12 .push_5 { - left:41.667%; -} - -.container_12 .push_6 { - left:50.0%; -} - -.container_12 .push_7 { - left:58.333%; -} - -.container_12 .push_8 { - left:66.667%; -} - -.container_12 .push_9 { - left:75.0%; -} - -.container_12 .push_10 { - left:83.333%; -} - -.container_12 .push_11 { - left:91.667%; -} - - - -/* Pull Space >> 12 Columns -----------------------------------------------------------------------------------------------------*/ - - -.container_12 .pull_1 { - left:-8.333%; -} - -.container_12 .pull_2 { - left:-16.667%; -} - -.container_12 .pull_3 { - left:-25.0%; -} - -.container_12 .pull_4 { - left:-33.333%; -} - -.container_12 .pull_5 { - left:-41.667%; -} - -.container_12 .pull_6 { - left:-50.0%; -} - -.container_12 .pull_7 { - left:-58.333%; -} - -.container_12 .pull_8 { - left:-66.667%; -} - -.container_12 .pull_9 { - left:-75.0%; -} - -.container_12 .pull_10 { - left:-83.333%; -} - -.container_12 .pull_11 { - left:-91.667%; -} - - - - -/* Clear Floated Elements -----------------------------------------------------------------------------------------------------*/ - -/* http://sonspring.com/journal/clearing-floats */ - -.clear { - clear: both; - display: block; - overflow: hidden; - visibility: hidden; - width: 0; - height: 0; -} - -/* http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack */ - -.clearfix:after { - clear: both; - content: ' '; - display: block; - font-size: 0; - line-height: 0; - visibility: hidden; - width: 0; - height: 0; -} - -.clearfix { - display: inline-block; -} - -* html .clearfix { - height: 1%; -} - -.clearfix { - display: block; -} /* forms.css */ diff --git a/app/assets/stylesheets/topics.css.scss b/app/assets/stylesheets/topics.css.scss index db05c87..09a5eeb 100644 --- a/app/assets/stylesheets/topics.css.scss +++ b/app/assets/stylesheets/topics.css.scss @@ -2,7 +2,7 @@ #topic_app_index{ position:absolute; - top:50px; + top:40px; left:0px; right:0px; bottom:0px; @@ -113,6 +113,12 @@ .note_file{ margin:8px 0px; + + .icon{ + height:20px; + position:relative; + top:4px; + } } .note_file_queue{ @@ -128,33 +134,29 @@ } } - .note_file_form{ - float:right; + .fileupload{ + + .add_file{ + background:black; + color:white; + padding:5px 10px; + position:absolute; + right:10px; + top:5px; + } + + .progress{ + position:absolute; + right:10px; + top:30px; + + } + input[type=file]{ display:none; } - label{ - color: #17b; - cursor:pointer; - &:hover, &:active { - color: #39e; - background-color: none; - outline: none; } - &:link, &:visited, &:hover { - -webkit-transition: all 0.3s ease; - -moz-transition: all 0.3s ease; - -o-transition: all 0.3s ease; - transition: all 0.3s ease; } - &:active { - color: #b41; - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; } - - } } diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 950f92c..a36d544 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -11,6 +11,7 @@ = csrf_meta_tag + %style=Pygments.css('.highlight') =javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false®ion=FR" @@ -30,13 +31,19 @@ #breadcrumb - =image_tag (current_admin.file? ? current_admin.file.square.url : ""), :class => "avatar", :style => "width:30px; border-radius:50%;" - - =link_to "Dashboard", "/admin" - =link_to "Se déconnecter", destroy_admin_session_path, :class => "logout_link" + + .personnal + =image_tag (current_admin.file? ? current_admin.file.square.url : ""), :class => "avatar" + %span + =current_admin.firstname + =current_admin.name + + .menu + =link_to "Se déconnecter", destroy_admin_session_path, :class => "logout_link" - + %nav + =link_to "Dashboard", "/admin" = yield diff --git a/app/views/note_files/_form.html.haml b/app/views/note_files/_form.html.haml index 2a840de..e7ee99e 100644 --- a/app/views/note_files/_form.html.haml +++ b/app/views/note_files/_form.html.haml @@ -1,4 +1,8 @@ %form.fileupload{:action => note_files_path(:note_id => note.id), :enctype => "multipart/form-data", :method => "POST"} + + + %button.add_file ajouter des fichiers + %input{:multiple => "", :name => "files[]", :type => "file", :style => "float:right;"} diff --git a/app/views/note_files/_note_file.html.haml b/app/views/note_files/_note_file.html.haml index f8e63dc..4b593da 100644 --- a/app/views/note_files/_note_file.html.haml +++ b/app/views/note_files/_note_file.html.haml @@ -1,4 +1,6 @@ .note_file#note_file{:id => note_file.id} + -ext = File.extname(note_file.file.path)[1..-1] + =image_tag "admin/file_types/"+ext+".png", :class => "icon" =l note_file.created_at, :format => :short =note_file.name =link_to "supprimer", note_file_path(note_file), :remote => true, :method => :delete, :confirm => "Voulez-vous vraiment supprimer ce fichier ?" diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml index 6e29678..4db2ad6 100644 --- a/app/views/notes/_form.html.haml +++ b/app/views/notes/_form.html.haml @@ -1,5 +1,5 @@ #note_form - + %p ``` = form_for @note, :remote => true do |f| =f.hidden_field :topic_id