diff --git a/NpgsqlBlogProvider/ChangeLog b/NpgsqlBlogProvider/ChangeLog index 383f59a6..cc31d06b 100644 --- a/NpgsqlBlogProvider/ChangeLog +++ b/NpgsqlBlogProvider/ChangeLog @@ -1,3 +1,8 @@ +2015-09-23 Paul Schneider + + * NpgsqlBlogProvider.cs: refactoring: The `UserName` property + from the `BlogEntry` class is renamed to `Author` + 2015-08-04 Paul Schneider * NpgsqlBlogProvider.cs: * Remove post by id diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs index d38171a1..533bae65 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs @@ -245,7 +245,7 @@ namespace Npgsql.Web.Blog be = new BlogEntry (); be.Title = rdr.GetString (rdr.GetOrdinal ("title")); be.Content = rdr.GetString (rdr.GetOrdinal ("bcontent")); - be.UserName = rdr.GetString (rdr.GetOrdinal ("username")); + be.Author = rdr.GetString (rdr.GetOrdinal ("username")); be.Modified = rdr.GetDateTime (rdr.GetOrdinal ("modified")); be.Posted = rdr.GetDateTime (rdr.GetOrdinal ("posted")); be.Visible = rdr.GetBoolean (rdr.GetOrdinal ("visible")); @@ -296,7 +296,7 @@ namespace Npgsql.Web.Blog BlogEntry be = new BlogEntry (); be.Title = title; be.Content = rdr.GetString (rdr.GetOrdinal ("bcontent")); - be.UserName = username; + be.Author = username; be.Modified = rdr.GetDateTime (rdr.GetOrdinal ("modified")); be.Posted = rdr.GetDateTime (rdr.GetOrdinal ("posted")); be.Visible = rdr.GetBoolean (rdr.GetOrdinal ("visible")); @@ -443,7 +443,7 @@ namespace Npgsql.Web.Blog " and m.member = u.pkid and u.username = :uname " + " and u.applicationname = :appname " + " group by a.post_id) ma on (ma.pid = b._id) " + - "where ( ma.acc IS NULL or ma.acc = TRUE or b.UserName = :uname) "; + "where ( ma.acc IS NULL or ma.acc = TRUE or b.username = :uname) "; cmd.Parameters.AddWithValue ("uname", readersName); } else { cmd.CommandText = "select _id, title,bcontent,modified," + @@ -485,7 +485,7 @@ namespace Npgsql.Web.Blog be.Title = rdr.GetString (rdr.GetOrdinal ("title")); be.Id = rdr.GetInt64 (rdr.GetOrdinal ("_id")); be.Content = rdr.GetString (rdr.GetOrdinal ("bcontent")); - be.UserName = rdr.GetString (rdr.GetOrdinal ("username")); + be.Author = rdr.GetString (rdr.GetOrdinal ("username")); be.Posted = rdr.GetDateTime (rdr.GetOrdinal ("posted")); be.Modified = rdr.GetDateTime (rdr.GetOrdinal ("modified")); be.Visible = rdr.GetBoolean (rdr.GetOrdinal ("visible")); @@ -558,7 +558,7 @@ namespace Npgsql.Web.Blog be.Id = rdr.GetInt64 (rdr.GetOrdinal ("_id")); be.Title = rdr.GetString (rdr.GetOrdinal ("title")); be.Content = rdr.GetString (rdr.GetOrdinal ("bcontent")); - be.UserName = rdr.GetString (rdr.GetOrdinal ("username")); + be.Author = rdr.GetString (rdr.GetOrdinal ("username")); be.Posted = rdr.GetDateTime (rdr.GetOrdinal ("posted")); be.Modified = rdr.GetDateTime (rdr.GetOrdinal ("modified")); be.Visible = true; // because of sql code used diff --git a/WebControls/ChangeLog b/WebControls/ChangeLog index 71d9d245..a859b82b 100644 --- a/WebControls/ChangeLog +++ b/WebControls/ChangeLog @@ -1,3 +1,7 @@ +2015-09-23 Paul Schneider + + * InputUserName.cs: formatting + 2015-09-10 Paul Schneider * InputCircle.cs: using the new CircleBase class diff --git a/WebControls/InputUserName.cs b/WebControls/InputUserName.cs index d7903883..ac9035e6 100644 --- a/WebControls/InputUserName.cs +++ b/WebControls/InputUserName.cs @@ -176,7 +176,7 @@ namespace Yavsc.WebControls if (!Array.Exists (roles, x => Roles.IsUserInRole (x))) continue; if (selected!=null) - if (Array.Exists(selected, x=> x == u.UserName)) + if (Array.Exists(selected, x=> x == u.UserName)) writer.AddAttribute ("selected",null); writer.RenderBeginTag ("option"); writer.Write (u.UserName); diff --git a/web/ApiControllers/BlogsController.cs b/web/ApiControllers/BlogsController.cs index 873b16ca..5f068c9b 100644 --- a/web/ApiControllers/BlogsController.cs +++ b/web/ApiControllers/BlogsController.cs @@ -89,7 +89,7 @@ namespace Yavsc.ApiControllers if (!(Request.Content.Headers.ContentType.MediaType=="multipart/form-data")) throw new HttpRequestException ("not a multipart/form-data request"); BlogEntry be = BlogManager.GetPost (id); - if (be.UserName != Membership.GetUser ().UserName) + if (be.Author != Membership.GetUser ().UserName) throw new AuthorizationDenied ("b"+id); string root = HttpContext.Current.Server.MapPath("~/bfiles/"+id); DirectoryInfo di = new DirectoryInfo (root); @@ -128,7 +128,7 @@ namespace Yavsc.ApiControllers if (!(Request.Content.Headers.ContentType.MediaType=="multipart/form-data")) throw new HttpRequestException ("not a multipart/form-data request"); BlogEntry be = BlogManager.GetPost (id); - if (be.UserName != Membership.GetUser ().UserName) + if (be.Author != Membership.GetUser ().UserName) throw new AuthorizationDenied ("b"+id); string root = HttpContext.Current.Server.MapPath("~/bfiles/"+id); DirectoryInfo di = new DirectoryInfo (root); @@ -162,7 +162,7 @@ namespace Yavsc.ApiControllers p.StartInfo.UseShellExecute = false; p.StartInfo.FileName = "/usr/bin/pandoc"; p.StartInfo.Arguments = - string.Format (" -o {0} -t markdown {1}", + string.Format (" -o '{0}' -t markdown '{1}'", fo.FullName, fi.FullName); p.StartInfo.RedirectStandardError = true; diff --git a/web/ApiControllers/CalendarController.cs b/web/ApiControllers/CalendarController.cs index 82b0679c..9919ff1b 100644 --- a/web/ApiControllers/CalendarController.cs +++ b/web/ApiControllers/CalendarController.cs @@ -156,7 +156,7 @@ namespace Yavsc.ApiControllers "à un compte utilisateur existant"); break; case MembershipCreateStatus.DuplicateUserName: - ModelState.AddModelError ("UserName", "Ce nom d'utilisateur est " + + ModelState.AddModelError ("Author", "Ce nom d'utilisateur est " + "déjà enregistré"); break; case MembershipCreateStatus.Success: diff --git a/web/ApiControllers/WorkFlowController.cs b/web/ApiControllers/WorkFlowController.cs index 8b7f8e4a..8a79f680 100644 --- a/web/ApiControllers/WorkFlowController.cs +++ b/web/ApiControllers/WorkFlowController.cs @@ -80,7 +80,7 @@ namespace Yavsc.ApiControllers string.Format(LocalizedText.DuplicateEmail,userModel.UserName) ); return ; case MembershipCreateStatus.DuplicateUserName: - ModelState.AddModelError ("UserName", + ModelState.AddModelError ("Author", string.Format(LocalizedText.DuplicateUserName,userModel.Email)); return ; case MembershipCreateStatus.Success: diff --git a/web/App_Themes/font-awesome.css b/web/App_Themes/font-awesome.css new file mode 100644 index 00000000..4040b3cf --- /dev/null +++ b/web/App_Themes/font-awesome.css @@ -0,0 +1,1672 @@ +/*! + * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) + */ +/* FONT PATH + * -------------------------- */ +@font-face { + font-family: 'FontAwesome'; + src: url('../fonts/fontawesome-webfont.eot?v=4.2.0'); + src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg'); + font-weight: normal; + font-style: normal; +} +.fa { + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +/* makes the font 33% larger relative to the icon container */ +.fa-lg { + font-size: 1.33333333em; + line-height: 0.75em; + vertical-align: -15%; +} +.fa-2x { + font-size: 2em; +} +.fa-3x { + font-size: 3em; +} +.fa-4x { + font-size: 4em; +} +.fa-5x { + font-size: 5em; +} +.fa-fw { + width: 1.28571429em; + text-align: center; +} +.fa-ul { + padding-left: 0; + margin-left: 2.14285714em; + list-style-type: none; +} +.fa-ul > li { + position: relative; +} +.fa-li { + position: absolute; + left: -2.14285714em; + width: 2.14285714em; + top: 0.14285714em; + text-align: center; +} +.fa-li.fa-lg { + left: -1.85714286em; +} +.fa-border { + padding: .2em .25em .15em; + border: solid 0.08em #eeeeee; + border-radius: .1em; +} +.pull-right { + float: right; +} +.pull-left { + float: left; +} +.fa.pull-left { + margin-right: .3em; +} +.fa.pull-right { + margin-left: .3em; +} +.fa-spin { + -webkit-animation: fa-spin 2s infinite linear; + animation: fa-spin 2s infinite linear; +} +@-webkit-keyframes fa-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@keyframes fa-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +.fa-rotate-90 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); + -webkit-transform: rotate(90deg); + -ms-transform: rotate(90deg); + transform: rotate(90deg); +} +.fa-rotate-180 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); + -webkit-transform: rotate(180deg); + -ms-transform: rotate(180deg); + transform: rotate(180deg); +} +.fa-rotate-270 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); + -webkit-transform: rotate(270deg); + -ms-transform: rotate(270deg); + transform: rotate(270deg); +} +.fa-flip-horizontal { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1); + -webkit-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + transform: scale(-1, 1); +} +.fa-flip-vertical { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1); + -webkit-transform: scale(1, -1); + -ms-transform: scale(1, -1); + transform: scale(1, -1); +} +:root .fa-rotate-90, +:root .fa-rotate-180, +:root .fa-rotate-270, +:root .fa-flip-horizontal, +:root .fa-flip-vertical { + filter: none; +} +.fa-stack { + position: relative; + display: inline-block; + width: 2em; + height: 2em; + line-height: 2em; + vertical-align: middle; +} +.fa-stack-1x, +.fa-stack-2x { + position: absolute; + left: 0; + width: 100%; + text-align: center; +} +.fa-stack-1x { + line-height: inherit; +} +.fa-stack-2x { + font-size: 2em; +} +.fa-inverse { + color: #ffffff; +} +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.fa-glass:before { + content: "\f000"; +} +.fa-music:before { + content: "\f001"; +} +.fa-search:before { + content: "\f002"; +} +.fa-envelope-o:before { + content: "\f003"; +} +.fa-heart:before { + content: "\f004"; +} +.fa-star:before { + content: "\f005"; +} +.fa-star-o:before { + content: "\f006"; +} +.fa-user:before { + content: "\f007"; +} +.fa-film:before { + content: "\f008"; +} +.fa-th-large:before { + content: "\f009"; +} +.fa-th:before { + content: "\f00a"; +} +.fa-th-list:before { + content: "\f00b"; +} +.fa-check:before { + content: "\f00c"; +} +.fa-remove:before, +.fa-close:before, +.fa-times:before { + content: "\f00d"; +} +.fa-search-plus:before { + content: "\f00e"; +} +.fa-search-minus:before { + content: "\f010"; +} +.fa-power-off:before { + content: "\f011"; +} +.fa-signal:before { + content: "\f012"; +} +.fa-gear:before, +.fa-cog:before { + content: "\f013"; +} +.fa-trash-o:before { + content: "\f014"; +} +.fa-home:before { + content: "\f015"; +} +.fa-file-o:before { + content: "\f016"; +} +.fa-clock-o:before { + content: "\f017"; +} +.fa-road:before { + content: "\f018"; +} +.fa-download:before { + content: "\f019"; +} +.fa-arrow-circle-o-down:before { + content: "\f01a"; +} +.fa-arrow-circle-o-up:before { + content: "\f01b"; +} +.fa-inbox:before { + content: "\f01c"; +} +.fa-play-circle-o:before { + content: "\f01d"; +} +.fa-rotate-right:before, +.fa-repeat:before { + content: "\f01e"; +} +.fa-refresh:before { + content: "\f021"; +} +.fa-list-alt:before { + content: "\f022"; +} +.fa-lock:before { + content: "\f023"; +} +.fa-flag:before { + content: "\f024"; +} +.fa-headphones:before { + content: "\f025"; +} +.fa-volume-off:before { + content: "\f026"; +} +.fa-volume-down:before { + content: "\f027"; +} +.fa-volume-up:before { + content: "\f028"; +} +.fa-qrcode:before { + content: "\f029"; +} +.fa-barcode:before { + content: "\f02a"; +} +.fa-tag:before { + content: "\f02b"; +} +.fa-tags:before { + content: "\f02c"; +} +.fa-book:before { + content: "\f02d"; +} +.fa-bookmark:before { + content: "\f02e"; +} +.fa-print:before { + content: "\f02f"; +} +.fa-camera:before { + content: "\f030"; +} +.fa-font:before { + content: "\f031"; +} +.fa-bold:before { + content: "\f032"; +} +.fa-italic:before { + content: "\f033"; +} +.fa-text-height:before { + content: "\f034"; +} +.fa-text-width:before { + content: "\f035"; +} +.fa-align-left:before { + content: "\f036"; +} +.fa-align-center:before { + content: "\f037"; +} +.fa-align-right:before { + content: "\f038"; +} +.fa-align-justify:before { + content: "\f039"; +} +.fa-list:before { + content: "\f03a"; +} +.fa-dedent:before, +.fa-outdent:before { + content: "\f03b"; +} +.fa-indent:before { + content: "\f03c"; +} +.fa-video-camera:before { + content: "\f03d"; +} +.fa-photo:before, +.fa-image:before, +.fa-picture-o:before { + content: "\f03e"; +} +.fa-pencil:before { + content: "\f040"; +} +.fa-map-marker:before { + content: "\f041"; +} +.fa-adjust:before { + content: "\f042"; +} +.fa-tint:before { + content: "\f043"; +} +.fa-edit:before, +.fa-pencil-square-o:before { + content: "\f044"; +} +.fa-share-square-o:before { + content: "\f045"; +} +.fa-check-square-o:before { + content: "\f046"; +} +.fa-arrows:before { + content: "\f047"; +} +.fa-step-backward:before { + content: "\f048"; +} +.fa-fast-backward:before { + content: "\f049"; +} +.fa-backward:before { + content: "\f04a"; +} +.fa-play:before { + content: "\f04b"; +} +.fa-pause:before { + content: "\f04c"; +} +.fa-stop:before { + content: "\f04d"; +} +.fa-forward:before { + content: "\f04e"; +} +.fa-fast-forward:before { + content: "\f050"; +} +.fa-step-forward:before { + content: "\f051"; +} +.fa-eject:before { + content: "\f052"; +} +.fa-chevron-left:before { + content: "\f053"; +} +.fa-chevron-right:before { + content: "\f054"; +} +.fa-plus-circle:before { + content: "\f055"; +} +.fa-minus-circle:before { + content: "\f056"; +} +.fa-times-circle:before { + content: "\f057"; +} +.fa-check-circle:before { + content: "\f058"; +} +.fa-question-circle:before { + content: "\f059"; +} +.fa-info-circle:before { + content: "\f05a"; +} +.fa-crosshairs:before { + content: "\f05b"; +} +.fa-times-circle-o:before { + content: "\f05c"; +} +.fa-check-circle-o:before { + content: "\f05d"; +} +.fa-ban:before { + content: "\f05e"; +} +.fa-arrow-left:before { + content: "\f060"; +} +.fa-arrow-right:before { + content: "\f061"; +} +.fa-arrow-up:before { + content: "\f062"; +} +.fa-arrow-down:before { + content: "\f063"; +} +.fa-mail-forward:before, +.fa-share:before { + content: "\f064"; +} +.fa-expand:before { + content: "\f065"; +} +.fa-compress:before { + content: "\f066"; +} +.fa-plus:before { + content: "\f067"; +} +.fa-minus:before { + content: "\f068"; +} +.fa-asterisk:before { + content: "\f069"; +} +.fa-exclamation-circle:before { + content: "\f06a"; +} +.fa-gift:before { + content: "\f06b"; +} +.fa-leaf:before { + content: "\f06c"; +} +.fa-fire:before { + content: "\f06d"; +} +.fa-eye:before { + content: "\f06e"; +} +.fa-eye-slash:before { + content: "\f070"; +} +.fa-warning:before, +.fa-exclamation-triangle:before { + content: "\f071"; +} +.fa-plane:before { + content: "\f072"; +} +.fa-calendar:before { + content: "\f073"; +} +.fa-random:before { + content: "\f074"; +} +.fa-comment:before { + content: "\f075"; +} +.fa-magnet:before { + content: "\f076"; +} +.fa-chevron-up:before { + content: "\f077"; +} +.fa-chevron-down:before { + content: "\f078"; +} +.fa-retweet:before { + content: "\f079"; +} +.fa-shopping-cart:before { + content: "\f07a"; +} +.fa-folder:before { + content: "\f07b"; +} +.fa-folder-open:before { + content: "\f07c"; +} +.fa-arrows-v:before { + content: "\f07d"; +} +.fa-arrows-h:before { + content: "\f07e"; +} +.fa-bar-chart-o:before, +.fa-bar-chart:before { + content: "\f080"; +} +.fa-twitter-square:before { + content: "\f081"; +} +.fa-facebook-square:before { + content: "\f082"; +} +.fa-camera-retro:before { + content: "\f083"; +} +.fa-key:before { + content: "\f084"; +} +.fa-gears:before, +.fa-cogs:before { + content: "\f085"; +} +.fa-comments:before { + content: "\f086"; +} +.fa-thumbs-o-up:before { + content: "\f087"; +} +.fa-thumbs-o-down:before { + content: "\f088"; +} +.fa-star-half:before { + content: "\f089"; +} +.fa-heart-o:before { + content: "\f08a"; +} +.fa-sign-out:before { + content: "\f08b"; +} +.fa-linkedin-square:before { + content: "\f08c"; +} +.fa-thumb-tack:before { + content: "\f08d"; +} +.fa-external-link:before { + content: "\f08e"; +} +.fa-sign-in:before { + content: "\f090"; +} +.fa-trophy:before { + content: "\f091"; +} +.fa-github-square:before { + content: "\f092"; +} +.fa-upload:before { + content: "\f093"; +} +.fa-lemon-o:before { + content: "\f094"; +} +.fa-phone:before { + content: "\f095"; +} +.fa-square-o:before { + content: "\f096"; +} +.fa-bookmark-o:before { + content: "\f097"; +} +.fa-phone-square:before { + content: "\f098"; +} +.fa-twitter:before { + content: "\f099"; +} +.fa-facebook:before { + content: "\f09a"; +} +.fa-github:before { + content: "\f09b"; +} +.fa-unlock:before { + content: "\f09c"; +} +.fa-credit-card:before { + content: "\f09d"; +} +.fa-rss:before { + content: "\f09e"; +} +.fa-hdd-o:before { + content: "\f0a0"; +} +.fa-bullhorn:before { + content: "\f0a1"; +} +.fa-bell:before { + content: "\f0f3"; +} +.fa-certificate:before { + content: "\f0a3"; +} +.fa-hand-o-right:before { + content: "\f0a4"; +} +.fa-hand-o-left:before { + content: "\f0a5"; +} +.fa-hand-o-up:before { + content: "\f0a6"; +} +.fa-hand-o-down:before { + content: "\f0a7"; +} +.fa-arrow-circle-left:before { + content: "\f0a8"; +} +.fa-arrow-circle-right:before { + content: "\f0a9"; +} +.fa-arrow-circle-up:before { + content: "\f0aa"; +} +.fa-arrow-circle-down:before { + content: "\f0ab"; +} +.fa-globe:before { + content: "\f0ac"; +} +.fa-wrench:before { + content: "\f0ad"; +} +.fa-tasks:before { + content: "\f0ae"; +} +.fa-filter:before { + content: "\f0b0"; +} +.fa-briefcase:before { + content: "\f0b1"; +} +.fa-arrows-alt:before { + content: "\f0b2"; +} +.fa-group:before, +.fa-users:before { + content: "\f0c0"; +} +.fa-chain:before, +.fa-link:before { + content: "\f0c1"; +} +.fa-cloud:before { + content: "\f0c2"; +} +.fa-flask:before { + content: "\f0c3"; +} +.fa-cut:before, +.fa-scissors:before { + content: "\f0c4"; +} +.fa-copy:before, +.fa-files-o:before { + content: "\f0c5"; +} +.fa-paperclip:before { + content: "\f0c6"; +} +.fa-save:before, +.fa-floppy-o:before { + content: "\f0c7"; +} +.fa-square:before { + content: "\f0c8"; +} +.fa-navicon:before, +.fa-reorder:before, +.fa-bars:before { + content: "\f0c9"; +} +.fa-list-ul:before { + content: "\f0ca"; +} +.fa-list-ol:before { + content: "\f0cb"; +} +.fa-strikethrough:before { + content: "\f0cc"; +} +.fa-underline:before { + content: "\f0cd"; +} +.fa-table:before { + content: "\f0ce"; +} +.fa-magic:before { + content: "\f0d0"; +} +.fa-truck:before { + content: "\f0d1"; +} +.fa-pinterest:before { + content: "\f0d2"; +} +.fa-pinterest-square:before { + content: "\f0d3"; +} +.fa-google-plus-square:before { + content: "\f0d4"; +} +.fa-google-plus:before { + content: "\f0d5"; +} +.fa-money:before { + content: "\f0d6"; +} +.fa-caret-down:before { + content: "\f0d7"; +} +.fa-caret-up:before { + content: "\f0d8"; +} +.fa-caret-left:before { + content: "\f0d9"; +} +.fa-caret-right:before { + content: "\f0da"; +} +.fa-columns:before { + content: "\f0db"; +} +.fa-unsorted:before, +.fa-sort:before { + content: "\f0dc"; +} +.fa-sort-down:before, +.fa-sort-desc:before { + content: "\f0dd"; +} +.fa-sort-up:before, +.fa-sort-asc:before { + content: "\f0de"; +} +.fa-envelope:before { + content: "\f0e0"; +} +.fa-linkedin:before { + content: "\f0e1"; +} +.fa-rotate-left:before, +.fa-undo:before { + content: "\f0e2"; +} +.fa-legal:before, +.fa-gavel:before { + content: "\f0e3"; +} +.fa-dashboard:before, +.fa-tachometer:before { + content: "\f0e4"; +} +.fa-comment-o:before { + content: "\f0e5"; +} +.fa-comments-o:before { + content: "\f0e6"; +} +.fa-flash:before, +.fa-bolt:before { + content: "\f0e7"; +} +.fa-sitemap:before { + content: "\f0e8"; +} +.fa-umbrella:before { + content: "\f0e9"; +} +.fa-paste:before, +.fa-clipboard:before { + content: "\f0ea"; +} +.fa-lightbulb-o:before { + content: "\f0eb"; +} +.fa-exchange:before { + content: "\f0ec"; +} +.fa-cloud-download:before { + content: "\f0ed"; +} +.fa-cloud-upload:before { + content: "\f0ee"; +} +.fa-user-md:before { + content: "\f0f0"; +} +.fa-stethoscope:before { + content: "\f0f1"; +} +.fa-suitcase:before { + content: "\f0f2"; +} +.fa-bell-o:before { + content: "\f0a2"; +} +.fa-coffee:before { + content: "\f0f4"; +} +.fa-cutlery:before { + content: "\f0f5"; +} +.fa-file-text-o:before { + content: "\f0f6"; +} +.fa-building-o:before { + content: "\f0f7"; +} +.fa-hospital-o:before { + content: "\f0f8"; +} +.fa-ambulance:before { + content: "\f0f9"; +} +.fa-medkit:before { + content: "\f0fa"; +} +.fa-fighter-jet:before { + content: "\f0fb"; +} +.fa-beer:before { + content: "\f0fc"; +} +.fa-h-square:before { + content: "\f0fd"; +} +.fa-plus-square:before { + content: "\f0fe"; +} +.fa-angle-double-left:before { + content: "\f100"; +} +.fa-angle-double-right:before { + content: "\f101"; +} +.fa-angle-double-up:before { + content: "\f102"; +} +.fa-angle-double-down:before { + content: "\f103"; +} +.fa-angle-left:before { + content: "\f104"; +} +.fa-angle-right:before { + content: "\f105"; +} +.fa-angle-up:before { + content: "\f106"; +} +.fa-angle-down:before { + content: "\f107"; +} +.fa-desktop:before { + content: "\f108"; +} +.fa-laptop:before { + content: "\f109"; +} +.fa-tablet:before { + content: "\f10a"; +} +.fa-mobile-phone:before, +.fa-mobile:before { + content: "\f10b"; +} +.fa-circle-o:before { + content: "\f10c"; +} +.fa-quote-left:before { + content: "\f10d"; +} +.fa-quote-right:before { + content: "\f10e"; +} +.fa-spinner:before { + content: "\f110"; +} +.fa-circle:before { + content: "\f111"; +} +.fa-mail-reply:before, +.fa-reply:before { + content: "\f112"; +} +.fa-github-alt:before { + content: "\f113"; +} +.fa-folder-o:before { + content: "\f114"; +} +.fa-folder-open-o:before { + content: "\f115"; +} +.fa-smile-o:before { + content: "\f118"; +} +.fa-frown-o:before { + content: "\f119"; +} +.fa-meh-o:before { + content: "\f11a"; +} +.fa-gamepad:before { + content: "\f11b"; +} +.fa-keyboard-o:before { + content: "\f11c"; +} +.fa-flag-o:before { + content: "\f11d"; +} +.fa-flag-checkered:before { + content: "\f11e"; +} +.fa-terminal:before { + content: "\f120"; +} +.fa-code:before { + content: "\f121"; +} +.fa-mail-reply-all:before, +.fa-reply-all:before { + content: "\f122"; +} +.fa-star-half-empty:before, +.fa-star-half-full:before, +.fa-star-half-o:before { + content: "\f123"; +} +.fa-location-arrow:before { + content: "\f124"; +} +.fa-crop:before { + content: "\f125"; +} +.fa-code-fork:before { + content: "\f126"; +} +.fa-unlink:before, +.fa-chain-broken:before { + content: "\f127"; +} +.fa-question:before { + content: "\f128"; +} +.fa-info:before { + content: "\f129"; +} +.fa-exclamation:before { + content: "\f12a"; +} +.fa-superscript:before { + content: "\f12b"; +} +.fa-subscript:before { + content: "\f12c"; +} +.fa-eraser:before { + content: "\f12d"; +} +.fa-puzzle-piece:before { + content: "\f12e"; +} +.fa-microphone:before { + content: "\f130"; +} +.fa-microphone-slash:before { + content: "\f131"; +} +.fa-shield:before { + content: "\f132"; +} +.fa-calendar-o:before { + content: "\f133"; +} +.fa-fire-extinguisher:before { + content: "\f134"; +} +.fa-rocket:before { + content: "\f135"; +} +.fa-maxcdn:before { + content: "\f136"; +} +.fa-chevron-circle-left:before { + content: "\f137"; +} +.fa-chevron-circle-right:before { + content: "\f138"; +} +.fa-chevron-circle-up:before { + content: "\f139"; +} +.fa-chevron-circle-down:before { + content: "\f13a"; +} +.fa-html5:before { + content: "\f13b"; +} +.fa-css3:before { + content: "\f13c"; +} +.fa-anchor:before { + content: "\f13d"; +} +.fa-unlock-alt:before { + content: "\f13e"; +} +.fa-bullseye:before { + content: "\f140"; +} +.fa-ellipsis-h:before { + content: "\f141"; +} +.fa-ellipsis-v:before { + content: "\f142"; +} +.fa-rss-square:before { + content: "\f143"; +} +.fa-play-circle:before { + content: "\f144"; +} +.fa-ticket:before { + content: "\f145"; +} +.fa-minus-square:before { + content: "\f146"; +} +.fa-minus-square-o:before { + content: "\f147"; +} +.fa-level-up:before { + content: "\f148"; +} +.fa-level-down:before { + content: "\f149"; +} +.fa-check-square:before { + content: "\f14a"; +} +.fa-pencil-square:before { + content: "\f14b"; +} +.fa-external-link-square:before { + content: "\f14c"; +} +.fa-share-square:before { + content: "\f14d"; +} +.fa-compass:before { + content: "\f14e"; +} +.fa-toggle-down:before, +.fa-caret-square-o-down:before { + content: "\f150"; +} +.fa-toggle-up:before, +.fa-caret-square-o-up:before { + content: "\f151"; +} +.fa-toggle-right:before, +.fa-caret-square-o-right:before { + content: "\f152"; +} +.fa-euro:before, +.fa-eur:before { + content: "\f153"; +} +.fa-gbp:before { + content: "\f154"; +} +.fa-dollar:before, +.fa-usd:before { + content: "\f155"; +} +.fa-rupee:before, +.fa-inr:before { + content: "\f156"; +} +.fa-cny:before, +.fa-rmb:before, +.fa-yen:before, +.fa-jpy:before { + content: "\f157"; +} +.fa-ruble:before, +.fa-rouble:before, +.fa-rub:before { + content: "\f158"; +} +.fa-won:before, +.fa-krw:before { + content: "\f159"; +} +.fa-bitcoin:before, +.fa-btc:before { + content: "\f15a"; +} +.fa-file:before { + content: "\f15b"; +} +.fa-file-text:before { + content: "\f15c"; +} +.fa-sort-alpha-asc:before { + content: "\f15d"; +} +.fa-sort-alpha-desc:before { + content: "\f15e"; +} +.fa-sort-amount-asc:before { + content: "\f160"; +} +.fa-sort-amount-desc:before { + content: "\f161"; +} +.fa-sort-numeric-asc:before { + content: "\f162"; +} +.fa-sort-numeric-desc:before { + content: "\f163"; +} +.fa-thumbs-up:before { + content: "\f164"; +} +.fa-thumbs-down:before { + content: "\f165"; +} +.fa-youtube-square:before { + content: "\f166"; +} +.fa-youtube:before { + content: "\f167"; +} +.fa-xing:before { + content: "\f168"; +} +.fa-xing-square:before { + content: "\f169"; +} +.fa-youtube-play:before { + content: "\f16a"; +} +.fa-dropbox:before { + content: "\f16b"; +} +.fa-stack-overflow:before { + content: "\f16c"; +} +.fa-instagram:before { + content: "\f16d"; +} +.fa-flickr:before { + content: "\f16e"; +} +.fa-adn:before { + content: "\f170"; +} +.fa-bitbucket:before { + content: "\f171"; +} +.fa-bitbucket-square:before { + content: "\f172"; +} +.fa-tumblr:before { + content: "\f173"; +} +.fa-tumblr-square:before { + content: "\f174"; +} +.fa-long-arrow-down:before { + content: "\f175"; +} +.fa-long-arrow-up:before { + content: "\f176"; +} +.fa-long-arrow-left:before { + content: "\f177"; +} +.fa-long-arrow-right:before { + content: "\f178"; +} +.fa-apple:before { + content: "\f179"; +} +.fa-windows:before { + content: "\f17a"; +} +.fa-android:before { + content: "\f17b"; +} +.fa-linux:before { + content: "\f17c"; +} +.fa-dribbble:before { + content: "\f17d"; +} +.fa-skype:before { + content: "\f17e"; +} +.fa-foursquare:before { + content: "\f180"; +} +.fa-trello:before { + content: "\f181"; +} +.fa-female:before { + content: "\f182"; +} +.fa-male:before { + content: "\f183"; +} +.fa-gittip:before { + content: "\f184"; +} +.fa-sun-o:before { + content: "\f185"; +} +.fa-moon-o:before { + content: "\f186"; +} +.fa-archive:before { + content: "\f187"; +} +.fa-bug:before { + content: "\f188"; +} +.fa-vk:before { + content: "\f189"; +} +.fa-weibo:before { + content: "\f18a"; +} +.fa-renren:before { + content: "\f18b"; +} +.fa-pagelines:before { + content: "\f18c"; +} +.fa-stack-exchange:before { + content: "\f18d"; +} +.fa-arrow-circle-o-right:before { + content: "\f18e"; +} +.fa-arrow-circle-o-left:before { + content: "\f190"; +} +.fa-toggle-left:before, +.fa-caret-square-o-left:before { + content: "\f191"; +} +.fa-dot-circle-o:before { + content: "\f192"; +} +.fa-wheelchair:before { + content: "\f193"; +} +.fa-vimeo-square:before { + content: "\f194"; +} +.fa-turkish-lira:before, +.fa-try:before { + content: "\f195"; +} +.fa-plus-square-o:before { + content: "\f196"; +} +.fa-space-shuttle:before { + content: "\f197"; +} +.fa-slack:before { + content: "\f198"; +} +.fa-envelope-square:before { + content: "\f199"; +} +.fa-wordpress:before { + content: "\f19a"; +} +.fa-openid:before { + content: "\f19b"; +} +.fa-institution:before, +.fa-bank:before, +.fa-university:before { + content: "\f19c"; +} +.fa-mortar-board:before, +.fa-graduation-cap:before { + content: "\f19d"; +} +.fa-yahoo:before { + content: "\f19e"; +} +.fa-google:before { + content: "\f1a0"; +} +.fa-reddit:before { + content: "\f1a1"; +} +.fa-reddit-square:before { + content: "\f1a2"; +} +.fa-stumbleupon-circle:before { + content: "\f1a3"; +} +.fa-stumbleupon:before { + content: "\f1a4"; +} +.fa-delicious:before { + content: "\f1a5"; +} +.fa-digg:before { + content: "\f1a6"; +} +.fa-pied-piper:before { + content: "\f1a7"; +} +.fa-pied-piper-alt:before { + content: "\f1a8"; +} +.fa-drupal:before { + content: "\f1a9"; +} +.fa-joomla:before { + content: "\f1aa"; +} +.fa-language:before { + content: "\f1ab"; +} +.fa-fax:before { + content: "\f1ac"; +} +.fa-building:before { + content: "\f1ad"; +} +.fa-child:before { + content: "\f1ae"; +} +.fa-paw:before { + content: "\f1b0"; +} +.fa-spoon:before { + content: "\f1b1"; +} +.fa-cube:before { + content: "\f1b2"; +} +.fa-cubes:before { + content: "\f1b3"; +} +.fa-behance:before { + content: "\f1b4"; +} +.fa-behance-square:before { + content: "\f1b5"; +} +.fa-steam:before { + content: "\f1b6"; +} +.fa-steam-square:before { + content: "\f1b7"; +} +.fa-recycle:before { + content: "\f1b8"; +} +.fa-automobile:before, +.fa-car:before { + content: "\f1b9"; +} +.fa-cab:before, +.fa-taxi:before { + content: "\f1ba"; +} +.fa-tree:before { + content: "\f1bb"; +} +.fa-spotify:before { + content: "\f1bc"; +} +.fa-deviantart:before { + content: "\f1bd"; +} +.fa-soundcloud:before { + content: "\f1be"; +} +.fa-database:before { + content: "\f1c0"; +} +.fa-file-pdf-o:before { + content: "\f1c1"; +} +.fa-file-word-o:before { + content: "\f1c2"; +} +.fa-file-excel-o:before { + content: "\f1c3"; +} +.fa-file-powerpoint-o:before { + content: "\f1c4"; +} +.fa-file-photo-o:before, +.fa-file-picture-o:before, +.fa-file-image-o:before { + content: "\f1c5"; +} +.fa-file-zip-o:before, +.fa-file-archive-o:before { + content: "\f1c6"; +} +.fa-file-sound-o:before, +.fa-file-audio-o:before { + content: "\f1c7"; +} +.fa-file-movie-o:before, +.fa-file-video-o:before { + content: "\f1c8"; +} +.fa-file-code-o:before { + content: "\f1c9"; +} +.fa-vine:before { + content: "\f1ca"; +} +.fa-codepen:before { + content: "\f1cb"; +} +.fa-jsfiddle:before { + content: "\f1cc"; +} +.fa-life-bouy:before, +.fa-life-buoy:before, +.fa-life-saver:before, +.fa-support:before, +.fa-life-ring:before { + content: "\f1cd"; +} +.fa-circle-o-notch:before { + content: "\f1ce"; +} +.fa-ra:before, +.fa-rebel:before { + content: "\f1d0"; +} +.fa-ge:before, +.fa-empire:before { + content: "\f1d1"; +} +.fa-git-square:before { + content: "\f1d2"; +} +.fa-git:before { + content: "\f1d3"; +} +.fa-hacker-news:before { + content: "\f1d4"; +} +.fa-tencent-weibo:before { + content: "\f1d5"; +} +.fa-qq:before { + content: "\f1d6"; +} +.fa-wechat:before, +.fa-weixin:before { + content: "\f1d7"; +} +.fa-send:before, +.fa-paper-plane:before { + content: "\f1d8"; +} +.fa-send-o:before, +.fa-paper-plane-o:before { + content: "\f1d9"; +} +.fa-history:before { + content: "\f1da"; +} +.fa-circle-thin:before { + content: "\f1db"; +} +.fa-header:before { + content: "\f1dc"; +} +.fa-paragraph:before { + content: "\f1dd"; +} +.fa-sliders:before { + content: "\f1de"; +} +.fa-share-alt:before { + content: "\f1e0"; +} +.fa-share-alt-square:before { + content: "\f1e1"; +} +.fa-bomb:before { + content: "\f1e2"; +} +.fa-soccer-ball-o:before, +.fa-futbol-o:before { + content: "\f1e3"; +} +.fa-tty:before { + content: "\f1e4"; +} +.fa-binoculars:before { + content: "\f1e5"; +} +.fa-plug:before { + content: "\f1e6"; +} +.fa-slideshare:before { + content: "\f1e7"; +} +.fa-twitch:before { + content: "\f1e8"; +} +.fa-yelp:before { + content: "\f1e9"; +} +.fa-newspaper-o:before { + content: "\f1ea"; +} +.fa-wifi:before { + content: "\f1eb"; +} +.fa-calculator:before { + content: "\f1ec"; +} +.fa-paypal:before { + content: "\f1ed"; +} +.fa-google-wallet:before { + content: "\f1ee"; +} +.fa-cc-visa:before { + content: "\f1f0"; +} +.fa-cc-mastercard:before { + content: "\f1f1"; +} +.fa-cc-discover:before { + content: "\f1f2"; +} +.fa-cc-amex:before { + content: "\f1f3"; +} +.fa-cc-paypal:before { + content: "\f1f4"; +} +.fa-cc-stripe:before { + content: "\f1f5"; +} +.fa-bell-slash:before { + content: "\f1f6"; +} +.fa-bell-slash-o:before { + content: "\f1f7"; +} +.fa-trash:before { + content: "\f1f8"; +} +.fa-copyright:before { + content: "\f1f9"; +} +.fa-at:before { + content: "\f1fa"; +} +.fa-eyedropper:before { + content: "\f1fb"; +} +.fa-paint-brush:before { + content: "\f1fc"; +} +.fa-birthday-cake:before { + content: "\f1fd"; +} +.fa-area-chart:before { + content: "\f1fe"; +} +.fa-pie-chart:before { + content: "\f200"; +} +.fa-line-chart:before { + content: "\f201"; +} +.fa-lastfm:before { + content: "\f202"; +} +.fa-lastfm-square:before { + content: "\f203"; +} +.fa-toggle-off:before { + content: "\f204"; +} +.fa-toggle-on:before { + content: "\f205"; +} +.fa-bicycle:before { + content: "\f206"; +} +.fa-bus:before { + content: "\f207"; +} +.fa-ioxhost:before { + content: "\f208"; +} +.fa-angellist:before { + content: "\f209"; +} +.fa-cc:before { + content: "\f20a"; +} +.fa-shekel:before, +.fa-sheqel:before, +.fa-ils:before { + content: "\f20b"; +} +.fa-meanpath:before { + content: "\f20c"; +} diff --git a/web/ChangeLog b/web/ChangeLog index 36f31d1f..7431dfcd 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,66 @@ +2015-09-23 Paul Schneider + + * font-awesome.css: an awesome css + + * hallo.js: Use a forked Hallo.js + + * showdown.js: + * to-markdown.js: + * mdd_gripper.png: + * mdd_toolbar.png: + * mdd_modal_background.png: The client side Markdown is now + implemented using Hallo.js + + * FontAwesome.otf: + * fontawesome-webfont.eot: + * fontawesome-webfont.svg: + * fontawesome-webfont.ttf: + * fontawesome-webfont.woff: + * fontawesome-webfont.woff2: awesome + + * MarkdownDeep.dll: a modified version to render video and + audio tags + + * BlogsController.cs: * refactoring: The `UserName` property + from the `BlogEntry` class is renamed to `Author` + * Fixes pandoc process on file named with some spaces + + * CalendarController.cs: + * WorkFlowController.cs: refactoring: The `UserName` property + from the `BlogEntry` class is renamed to `Author` + + * BlogsController.cs: UserName became Author on BlogEntry + objects + + * Global.asax.cs: route /fonts is now ignored. + + * MarkdownHelper.cs: transform Markdown using a given base url + + * App.master: jquery was not needed on all pages. + + * Edit.aspx: using Hallo.js + + * UserPost.aspx: + * UserPosts.aspx: + * RemoveTitle.aspx: refactoring + + * Web.config: ? + + * Web.csproj: * use my local assembly for MarkdownDeep.dll + * fontawesome integration + * Hallo.js, to-markdown.js, showdowwn.js integration + + + * packages.config: Now use forked MarkdownDeep + + * MarkdownDeepLib.min.js: + * MarkdownDeep License.txt: + * MarkdownDeep Quick Reference.txt: using my local revision + + * mdd_ajax_loader.gif: The client side Markdown is now + implemented using Hallo.js + + 2015-09-16 Paul Schneider * mdd_help.htm: diff --git a/web/Controllers/BlogsController.cs b/web/Controllers/BlogsController.cs index da2a97fc..4176800a 100644 --- a/web/Controllers/BlogsController.cs +++ b/web/Controllers/BlogsController.cs @@ -58,7 +58,7 @@ namespace Yavsc.Controllers if (Membership.FindUsersByName (user) != null) u = Membership.GetUser (user, false); if (u == null) { - ModelState.AddModelError ("UserName", + ModelState.AddModelError ("Author", string.Format ("Utilisateur inconu : {0}", user)); return BlogList (); } else { @@ -145,11 +145,11 @@ namespace Yavsc.Controllers { ViewData ["id"] = id; BlogEntry e = BlogManager.GetForReading (id); - UUTBlogEntryCollection c = new UUTBlogEntryCollection (e.UserName,e.Title); + UUTBlogEntryCollection c = new UUTBlogEntryCollection (e.Author,e.Title); c.Add (e); - ViewData ["user"] = c.UserName; + ViewData ["user"] = c.Author; ViewData ["title"] = c.Title; - Profile pr = new Profile (ProfileBase.Create (c.UserName)); + Profile pr = new Profile (ProfileBase.Create (c.Author)); if (pr == null) // the owner's profile must exist // in order to publish its bills @@ -164,7 +164,7 @@ namespace Yavsc.Controllers /// Users the post. /// Assume that : /// * bec.Count > O - /// * bec.All(x=>x.UserName == bec[0].UserName) ; + /// * bec.All(x=>x.Author == bec[0].Author) ; /// /// The post. /// Bec. @@ -172,7 +172,7 @@ namespace Yavsc.Controllers { if (ModelState.IsValid) if (bec.Count > 0) { - Profile pr = new Profile (ProfileBase.Create (bec.UserName)); + Profile pr = new Profile (ProfileBase.Create (bec.Author)); if (pr == null) // the owner's profile must exist // in order to publish its bills @@ -182,13 +182,13 @@ namespace Yavsc.Controllers ViewData ["BlogTitle"] = pr.BlogTitle; MembershipUser u = Membership.GetUser (); if (u != null) - ViewData ["UserName"] = u.UserName; + ViewData ["Author"] = u.UserName; if (!pr.BlogVisible) { // only deliver to admins or owner if (u == null) return View ("NotAuthorized"); else { - if (u.UserName != bec.UserName) + if (u.UserName != bec.Author) if (!Roles.IsUserInRole (u.UserName, "Admin")) return View ("NotAuthorized"); } @@ -241,7 +241,7 @@ namespace Yavsc.Controllers user = un; if (String.IsNullOrEmpty (title)) title = ""; - ViewData ["UserName"] = un; + ViewData ["Author"] = un; ViewData ["AllowedCircles"] = CircleManager.DefaultProvider.List (Membership.GetUser ().UserName).Select (x => new SelectListItem { Value = x.Id.ToString(), Text = x.Title @@ -259,7 +259,7 @@ namespace Yavsc.Controllers public ActionResult ValidateEdit (BlogEntry model) { ViewData ["SiteName"] = sitename; - ViewData ["BlogUser"] = Membership.GetUser ().UserName; + ViewData ["Author"] = Membership.GetUser ().UserName; if (ModelState.IsValid) { if (model.Id != 0) { // ensures rights to update @@ -268,8 +268,8 @@ namespace Yavsc.Controllers } else - model.Id = BlogManager.Post (model.UserName, model.Title, model.Content, model.Visible, model.AllowedCircles); - return RedirectToAction ("UserPosts", new { user = model.UserName, title = model.Title }); + model.Id = BlogManager.Post (model.Author, model.Title, model.Content, model.Visible, model.AllowedCircles); + return RedirectToAction ("UserPosts", new { user = model.Author, title = model.Title }); } return View ("Edit", model); } @@ -284,9 +284,10 @@ namespace Yavsc.Controllers BlogEntry e = BlogManager.GetForEditing (id); string user = Membership.GetUser ().UserName; - Profile pr = new Profile (ProfileBase.Create(e.UserName)); + Profile pr = new Profile (ProfileBase.Create(e.Author)); ViewData ["BlogTitle"] = pr.BlogTitle; ViewData ["LOGIN"] = user; + ViewData ["Id"] = id; // Populates the circles combo items if (e.AllowedCircles == null) @@ -334,7 +335,7 @@ namespace Yavsc.Controllers if (Request.UrlReferrer != null) returnUrl = Request.UrlReferrer.AbsoluteUri; ViewData ["returnUrl"] = returnUrl; - ViewData ["UserName"] = user; + ViewData ["Author"] = user; ViewData ["Title"] = title; if (Membership.GetUser ().UserName != user) diff --git a/web/Global.asax.cs b/web/Global.asax.cs index 075bd10b..41747c1d 100644 --- a/web/Global.asax.cs +++ b/web/Global.asax.cs @@ -42,6 +42,7 @@ namespace Yavsc routes.IgnoreRoute ("bfiles/{*pathInfo}"); // Blog files routes.IgnoreRoute ("xmldoc/{*pathInfo}"); // xml doc routes.IgnoreRoute ("htmldoc/{*pathInfo}"); // html doc + routes.IgnoreRoute ("fonts/{*pathInfo}"); // fonts routes.IgnoreRoute ("favicon.ico"); // favorite icon routes.IgnoreRoute ("favicon.png"); // favorite icon routes.IgnoreRoute ("robots.txt"); // for search engine robots diff --git a/web/Helpers/MarkdownHelper.cs b/web/Helpers/MarkdownHelper.cs index cc10ff14..14623704 100644 --- a/web/Helpers/MarkdownHelper.cs +++ b/web/Helpers/MarkdownHelper.cs @@ -25,6 +25,24 @@ namespace Yavsc.Helpers return new MvcHtmlString(html); } + + /// + /// Transforms a string of Markdown into HTML. + /// + /// HtmlHelper - Not used, but required to make this an extension method. + /// The Markdown that should be transformed. + /// The url Base Location. + /// The HTML representation of the supplied Markdown. + public static IHtmlString Markdown(this HtmlHelper helper, string text, string urlBaseLocation="") + { + // Transform the supplied text (Markdown) into HTML. + var markdownTransformer = new Markdown(); + markdownTransformer.ExtraMode = true; + markdownTransformer.UrlBaseLocation = urlBaseLocation; + string html = markdownTransformer.Transform(text); + // Wrap the html in an MvcHtmlString otherwise it'll be HtmlEncoded and displayed to the user as HTML :( + return new MvcHtmlString(html); + } /// /// Transforms a string of Markdown into HTML. /// diff --git a/web/Models/App.master b/web/Models/App.master index 8817d688..d6ff15b1 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -11,8 +11,6 @@ ViewState["orgtitle"] = Html.Translate(Page.Title); - @@ -44,8 +42,8 @@ var apiBaseUrl = '<%=Url.Content(Yavsc.WebApiConfig.UrlPrefixRelative)%>'; <% } else { %>
-vos posts -
Votre Blog
+vos billets +
Vos billets
diff --git a/web/Scripts/MarkdownDeep License.txt b/web/Scripts/MarkdownDeep License.txt deleted file mode 100644 index 3787ba80..00000000 --- a/web/Scripts/MarkdownDeep License.txt +++ /dev/null @@ -1,16 +0,0 @@ -MarkdownDeep License -==================== - -MarkdownDeep - -Copyright (C) 2010-2011 Topten Software - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this product except in -compliance with the License. You may obtain a copy of the License at - - - -Unless required by applicable law or agreed to in writing, software distributed under the License is -distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and limitations under the License. - - diff --git a/web/Scripts/MarkdownDeep Quick Reference.txt b/web/Scripts/MarkdownDeep Quick Reference.txt deleted file mode 100644 index f8a2ff58..00000000 --- a/web/Scripts/MarkdownDeep Quick Reference.txt +++ /dev/null @@ -1,60 +0,0 @@ -MarkdownDeep Quick Reference -============================ - -Setting up the Client Side Editor ---------------------------------- - -The following assumes you've installed the full edition MarkdownDeep using NuGet and explains how to setup -a client side editor with toolbar, resize bar, real-time preview and syntax reference help. - -1. In either your master view page, or in the view containing the editor ensure the following references are in place: - - - - - -2. Insert the following markup at the location you want the editor to appear: - -
- <%=Html.TextArea("content", new { @class="mdd_editor" }) %> -
-
- - Note, the mdd_toolbar, mdd_resizer and mdd_preview divs are all optional. If ommitted, the jQuery plugin will - create them however this may cause the page to appear to "jump" as it loads. By using the above divs and the - associated mdd_styles.css stylesheet, the correct sizing can be in-place immediately, eliminating these jumps. - -3. Use the jQuery plugin to convert the textarea into a Markdown editor. For more options, see below. - - $(function () { - $("textarea.mdd_editor").MarkdownDeep({ - help_location:"/Scripts/mdd_help.htm", - ExtraMode: true - }); - }) - -See for more information on configuring the editor. - -Server Side Translation ------------------------ - -The above steps allow you to create forms where the user can enter and preview Markdown content. This section -explains how to perform the equivalent translation of the entered content server side. - -1. When you installed MarkdownDeep to your project with NuGet, a reference to MarkdownDeep.dll would already have - been created. - -2. To translate Markdown, instantiate an instance of the MarkdownDeep class and call it's Translate method to - do the translation: - - // Instantiate - var md=new MarkdownDeep.Markdown(); - - // Set options - md.ExtraMode=true; - - // Translate - var html=md.Transform(plaintext); - - -See for other methods and properties. diff --git a/web/Scripts/MarkdownDeepLib.min.js b/web/Scripts/MarkdownDeepLib.min.js deleted file mode 100644 index e6e20bbc..00000000 --- a/web/Scripts/MarkdownDeepLib.min.js +++ /dev/null @@ -1,443 +0,0 @@ -// MarkdownDeep - http://www.toptensoftware.com/markdowndeep -// Copyright (C) 2010-2011 Topten Software -// Minified by MiniME from toptensoftware.com -var MarkdownDeep=new(function(){function S(b,e){if(b.indexOf!==undefined)return b.indexOf(e);for(var c=0;c=0){var m=c.indexOf("\n");if(m>=0)if(m -0){b.x( -'\n
\n');b.x("
\n");b.x("
    \n");for(var g=0;g\n');var o='↩',e=h.C[h.C.length-1];if(e.v==12){e.v=29;e.X=o}else{e=new B();e.N=0;e.v=29;e.X=o;h.C.push(e -)}h.l(this,b);b.x("\n")}b.x("
\n");b.x("
\n")}return b.bh()};i.prototype.OnQualifyUrl=function(b){if(aj(b) -)return b;if(au(b,"/")){var e=this.UrlRootLocation;if(!e){if(!this.UrlBaseLocation)return b;var c=this.UrlBaseLocation. -indexOf("://");if(c==-1)c=0;else c+=3;c=this.UrlBaseLocation.indexOf("/",c);e=c<0?this.UrlBaseLocation:this. -UrlBaseLocation.substr(0,c)}return e+b}else{if(!this.UrlBaseLocation)return b;if(!T(this.UrlBaseLocation,"/")) -return this.UrlBaseLocation+"/"+b;else return this.UrlBaseLocation+b}};i.prototype.OnGetImageSize=function(b,c){ -return null};i.prototype.OnPrepareLink=function(b){var c=b.attributes.href;if(this.NoFollowLinks)b.attributes.rel= -"nofollow";if(this.NewWindowForExternalLinks&&aj(c)||this.NewWindowForLocalLinks&&!aj(c))b.attributes.target="_blank";b. -attributes.href=this.OnQualifyUrl(c)};i.prototype.OnPrepareImage=function(b,e){var c=this.OnGetImageSize(b.attributes. -src,e);if(c!=null){b.attributes.width=c.width;b.attributes.height=c.height}b.attributes.src=this.OnQualifyUrl(b. -attributes.src)};i.prototype.GetLinkDefinition=function(c){var b=this.bv[c];if(b==undefined)return null;else return b};a -.aE=function(b){this.bv=[];this.bs=[];this.bI=[];this.bJ=[];this.bn=null;return new D(this,this.MarkdownInHtml).aH(b)};a -.A=function(b){this.bv[b.id]=b};a.z=function(b){this.bs[b.X]=b};a.Q=function(c){var b=this.bs[c];if(b!=undefined){this. -bI.push(b);delete this.bs[c];return this.bI.length-1}else return-1};a.y=function(b,c){if(this.bn==null)this.bn=[];this. -bn[b]={Abbr:b,Title:c}};a.am=function(){return this.bn};a.aC=function(j,h,g){if(!this.AutoHeadingIDs)return null;var b= -this.bz.aB(j,h,g);if(!b)b="section";var c=b,e=1;while(this.bJ[c]!=undefined){c=b+"-"+e.toString();e++}this.bJ[c]=true; -return c};a.as=function(){this.bE.K();return this.bE};function X(b){return b>="0"&&b<="9"}function af(b){return b>="0"&& -b<="9"||b>="a"&&b<="f"||b>="A"&&b<="F"}function ac(b){return b>="a"&&b<="z"||b>="A"&&b<="Z"}function R(b){return b>="a" -&&b<="z"||b>="A"&&b<="Z"||b>="0"&&b<="9"}function ad(b){return b==" "||b=="\t"||b=="\r"||b=="\n"}function ab(b){return b -==" "||b=="\t"}function Y(b){return b=="\r"||b=="\n"}function ae(b){return b=="*"||b=="_"}function U(b,c){switch(b){case -"\\":case"`":case"*":case"_":case"{":case"}":case"[":case"]":case"(":case")":case">":case"#":case"+":case"-":case".": -case"!":return true;case":":case"|":case"=":case"<":return c}return false}function as(c,b){if(c.charAt(b)!="&")return-1; -var g=b;b++;var e;if(c.charAt(b)=="#"){b++;if(c.charAt(b)=="x"||c.charAt(b)=="X"){b++;e=af}else e=X}else e=R;if(e(c. -charAt(b))){b++;while(e(c.charAt(b)))b++;if(c.charAt(b)==";"){b++;return b}}b=g;return-1}function az(c,h){var b=c. -indexOf("\\");if(b<0)return c;var g=new F(),e=0;while(b>=0){if(U(c.charAt(b+1),h)){if(b>e)g.x(c.substr(e,b-e));e=b+1}b=c -.indexOf("\\",b+1)}if(eb&&ad(e.charAt(c-1)))c--;return e.substr(b,c-b)}function ah(c){var b=c.indexOf("@");if(b<0 -)return false;var e=c.lastIndexOf(".");if(e=e&&ad(c.charAt(b)))b--;if(b=e&&c.charAt(b)!= -"{")b--;if(be&&ad(c.charAt( -b-1)))b--;return{id:h,end:b}}function au(c,b){return c.substr(0,b.length)==b}function T(c,b){return c.substr(-b.length) -==b}function aj(b){return b.indexOf("://")>=0||au(b,"mailto:")}function F(){this.bq=[]}a=F.prototype;a.x=function(b){if( -b)this.bq.push(b)};a.K=function(){this.bq.length=0};a.bh=function(){return this.bq.join("")};a.aw=function(c){var g=c. -length;for(var b=0;b0.90&&c.charAt(b)!="@")this.x(c.charAt(b));else if(e>0.45){this.x( -"&#");this.x(c.charCodeAt(b).toString());this.x(";")}else{this.x("&#x");this.x(c.charCodeAt(b).toString(16));this.x(";") -}}};a.au=function(e,g,j){var h=g+j,b=g,c;for(c=g;cb)this.x(e.substr(b,c-b));this -.x("&");b=c+1;break;case"<":if(c>b)this.x(e.substr(b,c-b));this.x("<");b=c+1;break;case">":if(c>b)this.x(e.substr -(b,c-b));this.x(">");b=c+1;break;case'"':if(c>b)this.x(e.substr(b,c-b));this.x(""");b=c+1;break}if(c>b)this.x(e. -substr(b,c-b))};a.bf=function(e,g,k){var j=g+k,c=g,b;for(b=g;bc)this.x(e.substr(c,b-c));this.x("&");c=b+1}else b=h-1;break;case"<":if(b>c)this.x(e.substr(c,b-c));this.x( -"<");c=b+1;break;case">":if(b>c)this.x(e.substr(c,b-c));this.x(">");c=b+1;break;case'"':if(b>c)this.x(e.substr(c,b --c));this.x(""");c=b+1;break}if(b>c)this.x(e.substr(c,b-c))};a.be=function(e,g,k){var j=g+k,c=g,b;for(b=g;bc)this.x(e.substr(c,b-c));this.x("&");c=b+1}else b=h-1;break} -if(b>c)this.x(e.substr(c,b-c))};a.av=function(e,h,k){var j=h+k,b=h,g=0,c;for(c=h;cb)this.x(e.substr(b,c-b));b=c+1;this.x(" ");g++;while(g%4!=0){this.x(" ");g++}g--;break;case"\r":case"\n":if(c>b) -this.x(e.substr(b,c-b));this.x("\n");b=c+1;continue;case"&":if(c>b)this.x(e.substr(b,c-b));this.x("&");b=c+1;break; -case"<":if(c>b)this.x(e.substr(b,c-b));this.x("<");b=c+1;break;case">":if(c>b)this.x(e.substr(b,c-b));this.x(">"); -b=c+1;break;case'"':if(c>b)this.x(e.substr(b,c-b));this.x(""");b=c+1;break}g++}if(c>b)this.x(e.substr(b,c-b))}; -function G(){this.aU.apply(this,arguments)}a=G.prototype;a.D=function(){return this.by==this.start};a.J=function(){ -return this.by>=this.end};a.Y=function(){if(this.by>=this.end)return true;var b=this.E.charAt(this.by);return b=="\r"||b -=="\n"||b==undefined||b==""};a.aU=function(){this.E=arguments.length>0?arguments[0]:null;this.start=arguments.length>1? -arguments[1]:0;this.end=arguments.length>2?this.start+arguments[2]:this.E==null?0:this.E.length;this.by=this.start;this. -charset_offsets={}};a.H=function(){if(this.by>=this.end)return"\x00";return this.E.charAt(this.by)};a.aM=function(){ -return this.E.substr(this.by)};a.ba=function(){this.by=this.end};a.a5=function(b){this.by+=b};a.bb=function(){this.by= -this.E.indexOf("\n",this.by);if(this.by<0)this.by=this.end};a.aZ=function(){var b=this.by;if(this.E.charAt(this.by)== -"\r")this.by++;if(this.E.charAt(this.by)=="\n")this.by++;return this.by!=b};a.bc=function(){this.bb();this.aZ()};a.F= -function(b){if(this.by+b>=this.end)return"\x00";return this.E.charAt(this.by+b)};a.aW=function(b){if(this.E.charAt(this. -by)==b){this.by++;return true}return false};a.a9=function(b){if(this.E.substr(this.by,b.length)==b){this.by+=b.length; -return true}return false};a.bd=function(){var c=this.by;while(true){var b=this.E.charAt(this.by);if(b!=" "&&b!="\t"&&b!= -"\r"&&b!="\n")break;this.by++}return this.by!=c};a.a8=function(){var c=this.by;while(true){var b=this.E.charAt(this.by); -if(b!=" "&&b!="\t")break;this.by++}return this.by!=c};a.aa=function(c){c.lastIndex=this.by;var b=c.exec(this.E);if(b== -null){this.by=this.end;return false}if(b.index+b[0].length>this.end){this.by=this.end;return false}this.by=b.index; -return true};a.ad=function(g){var c=-1;for(var e in g){var b=g[e];if(b==null){b={};b.bD=-1;b.bt=-1;g[e]=b}if(b.bD==-1|| -this.by=b.bt&&b.bt!=-1){b.bD=this.by;b.bt=this.E.indexOf(e,this.by)}if(c==-1||b.bt=this.by)return"";else - return this.E.substr(this.mark,this.by-this.mark)};a.a7=function(){var b=this.E.charAt(this.by);if(b>="a"&&b<="z"||b>= -"A"&&b<="Z"||b=="_"){this.by++;while(true){b=this.E.charAt(this.by);if(b>="a"&&b<="z"||b>="A"&&b<="Z"||b=="_"||b>="0"&&b -<="9")this.by++;else return true}}return false};a.a4=function(){var e=this.by;this.a8();this.az();while(true){var b=this -.H();if(R(b)||b=="-"||b=="_"||b==":"||b=="."||b==" ")this.a5(1);else break}if(this.by>this.mark){var c=ay(this.W());if(c -.length>0){this.a8();return c}}this.by=e;return null};a.a6=function(){if(this.E.charAt(this.by)!="&")return false;var b= -as(this.E,this.by);if(b<0)return false;this.by=b;return true};a.a2=function(b){if(this.E.charAt(this.by)=="\\"&&U(this.E -.charAt(this.by+1),b)){this.by+=2;return true}else{if(this.by");else b.x(">")};a.aO= -function(b){b.x("")};function ai(b){b=b.toLowerCase();return b.substr(0,7)=="http://"||b. -substr(0,8)=="https://"||b.substr(0,6)=="ftp://"}function ag(b){var e=b.by,c=ap(b);if(c!=null)return c;b.by=e; -return null}function ap(b){if(b.H()!="<")return null;b.a5(1);if(b.a9("!--")){b.az();if(b.Z("-->")){var g=new w("!");g. -attributes.content=b.W();g.closed=true;b.a5(3);return g}}var h=b.aW("/");b.az();if(!b.a7())return null;var c=new w(b.W() -);c.closing=h;if(h){if(b.H()!=">")return null;b.a5(1);return c}while(!b.J()){b.bd();if(b.a9("/>")){c.closed=true; -return c}if(b.aW(">"))return c;b.az();if(!b.a7())return null;var e=b.W();b.bd();if(b.aW("=")){b.bd();if(b.aW('"')){b.az( -);if(!b.Z('"'))return null;c.attributes[e]=b.W();b.a5(1)}else{b.az();while(!b.J()&&!ad(b.H())&&b.H()!=">"&&b.H()!="/")b. -a5(1);if(!b.J())c.attributes[e]=b.W()}}else c.attributes[e]=""}return null}var Q={b:1,blockquote:1,code:1,dd:1,dt:1,dl:1 -,del:1,em:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,i:1,kbd:1,li:1,ol:1,ul:1,p:1,pre:1,s:1,sub:1,sup:1,strong:1,strike:1,img:1,a:1 -},O={a:{href:1,title:1,"class":1},img:{src:1,width:1,height:1,alt:1,title:1,"class":1}},d=1,l=2,u=4,f=8,aw={p:d|f,div:d, -h1:d|f,h2:d|f,h3:d|f,h4:d|f,h5:d|f,h6:d|f,blockquote:d,pre:d,table:d,dl:d,ol:d,ul:d,form:d,fieldset:d,iframe:d,script:d| -l,noscript:d|l,math:d|l,ins:d|l,del:d|l,img:d|l,li:f,dd:f,dt:f,td:f,th:f,legend:f,address:f,hr:d|u,"!":d|u,head:d}; -delete d;delete l;delete u;function C(c,e,b){this.id=c;this.url=e;if(b==undefined)this.title=null;else this.title=b}a=C. -prototype;a.aR=function(h,b,g){if(this.url.substr(0,7).toLowerCase()=="mailto:"){b.x('");b.aw(g);b.x("")}else{var e= -new w("a"),c=h.as();c.bf(this.url,0,this.url.length);e.attributes.href=c.bh();if(this.title){c.K();c.bf(this.title,0, -this.title.length);e.attributes.title=c.bh()}h.OnPrepareLink(e);e.aS(b);b.x(g);b.x("")}};a.aP=function(g,h,e){var c= -new w("img"),b=g.as();b.bf(this.url,0,this.url.length);c.attributes.src=b.bh();if(e){b.K();b.bf(e,0,e.length);c. -attributes.alt=b.bh()}if(this.title){b.K();b.bf(this.title,0,this.title.length);c.attributes.title=b.bh()}c.closed=true; -g.OnPrepareImage(c,g.RenderingTitledImage);c.aS(h)};function an(b,e){var g=b.by,c=aq(b,e);if(c==null)b.by=g;return c} -function aq(b,e){b.bd();if(!b.aW("["))return null;b.az();if(!b.Z("]"))return null;var c=b.W();if(c.length==0)return null -;if(!b.a9("]:"))return null;var g=ar(b,c,e);b.a8();if(!b.Y())return null;return g}function ar(b,h,c){b.bd();if(b.Y()) -return null;var e=new C(h);if(b.aW("<")){b.az();while(b.H()!=">"){if(b.J())return null;b.a2(c)}var p=b.W();if(!b.aW(">") -)return null;e.url=az(ay(p),c);b.bd()}else{b.az();var k=1;while(!b.Y()){var j=b.H();if(ad(j))break;if(h==null)if(j=="(") -k++;else if(j==")"){k--;if(k==0)break}b.a2(c)}e.url=az(ay(b.W()),c)}b.a8();if(b.H()==")")return e;var m=b.Y(),n=b.by;if( -b.Y()){b.aZ();b.a8()}var g;switch(b.H()){case"'":case'"':g=b.H();break;case"(":g=")";break;default:if(m){b.by=n;return e -}else return null}b.a5(1);b.az();while(true){if(b.Y())return null;if(b.H()==g){if(g!=")"){var o=b.by;b.a5(1);b.a8();if(h -==null&&b.H()!=")"||h!=null&&!b.Y())continue;b.by=o}break}b.a2(c)}e.title=az(b.W(),c);b.a5(1);return e}function am(b,c){ -this.def=b;this.link_text=c}function ax(e,c,b){this.type=e;this.startOffset=c;this.length=b;this.X=null}function E(b){ -this.bw=b;this.bB=new G();this.bG=[];this.br=false;this.bH=[]}a=E.prototype;a.ah=function(b,e,h,g){this.bj(e,h,g);if( -this.bH.length==1&&this.bw.HtmlClassTitledImages!=null&&this.bH[0].type==10){var c=this.bH[0].X;b.x('
\n');this.bw.RenderingTitledImage=true;this.l(b,e);this.bw.RenderingTitledImage= -false;b.x("\n");if(c.def.title){b.x("

");b.bf(c.def.title,0,c.def.title.length);b.x("

\n")}b.x("
\n")}else{b.x -("

");this.l(b,e);b.x("

\n")}};a.af=function(c,b){this.ae(c,b,0,b.length)};a.ae=function(c,b,g,e){this.bj(b,g,e); -this.l(c,b)};a.ag=function(c){var b=new F();this.ae(b,c,0,c.length);return b.bh()};a.aB=function(j,n,m){this.bj(j,n,m); -var k=this.bH,c=new F();for(var h=0;h\n");break;case 3:b.x("");break; -case 4:b.x("");break;case 5:b.x("");break;case 6:b.x("");break;case 7:b.x("");b.au(h,c. -startOffset,c.length);b.x("");break;case 9:var g=c.X,m=new E(this.bw);m.br=true;g.def.aR(this.bw,b,m.ag(g. -link_text));break;case 10:var g=c.X;g.def.aP(this.bw,b,g.link_text);break;case 14:var k=c.X;b.x('');b.x(k.index+1);b.x("");break;case 15:var e=c.X; -b.x("");b.au(e.Abbr,0,e.Abbr.length);b -.x("");break}this.ak(c)}};a.bj=function(y,x,s){var b=this.bB;b.aU(y,x,s);var j=this.bH;j.length=0;var h=null,k= -this.bw.am(),o=k==null?/[\*\_\`\[\!\<\&\ \\]/g:null,q=this.bw.ExtraMode,g=b.by;while(!b.J()){if(o!=null&&!b.aa(o))break; -var m=b.by,c=null;switch(b.H()){case"*":case"_":c=this.P();if(c!=null)switch(c.type){case 13:case 11:case 12:if(h==null) -h=[];h.push(c);break}break;case"`":c=this.aF();break;case"[":case"!":var t=b.by;c=this.aI();if(c==null)b.by=t;break;case -"<":var e=b.by,p=ag(b);if(p!=null)if(!this.bw.SafeMode||p.at())c=this.U(1,e,b.by-e);else b.by=e;else{b.by=e;c=this.aD(); -if(c==null)b.by=e}break;case"&":var e=b.by;if(b.a6())c=this.U(2,e,b.by-e);break;case" ":if(b.F(1)==" "&&Y(b.F(2))){b.a5( -2);if(!b.J()){b.aZ();c=this.U(8,m,0)}}break;case"\\":if(U(b.F(1),q)){c=this.U(0,b.by+1,1);b.a5(2)}break}if(c==null&&k!= -null&&!R(b.F(-1))){var v=b.by;for(var r in k){var n=k[r];if(b.a9(n.Abbr)&&!R(b.H())){c=this.O(15,n);break}b.bK=v}}if(c!= -null){if(m>g)j.push(this.U(0,g,m-g));j.push(c);g=b.by}else b.a5(1)}if(b.by>g)j.push(this.U(0,g,b.by-g));if(h!=null)this. -aV(j,h)};a.P=function(){var b=this.bB,e=b.H(),k=e=="*"?"_":"*",c=b.by;if(b.D()||ad(b.F(-1))){while(ae(b.H()))b.a5(1);if( -b.J()||ad(b.H()))return this.U(2,c,b.by-c);b.by=c}while(ae(b.F(-1)))b.a5(-1);var h=b.D()||ad(b.F(-1));b.by=c;while(b.H() -==e)b.a5(1);var j=b.by-c;while(ae(b.F(1)))b.a5(1);var g=b.J()||ad(b.H());b.by=c+j;if(h)return this.U(11,c,b.by-c);if(g) -return this.U(12,c,b.by-c);if(this.bw.ExtraMode&&e=="_")return null;return this.U(13,c,b.by-c)};a.bg=function(h,g,b,c){ -var e=this.U(b.type,b.startOffset+c,b.length-c);b.length=c;g.splice(S(g,b)+1,0,e);h.splice(S(h,b)+1,0,e);return e};a.aV= -function(n,b){var m=this.bB.E,j=true;while(j){j=false;for(var h=0;h=3)e=e%2==1?1:2;if(c.length>e){c=this.bg(n,b,c,c.length-e) -;h--}if(g.length>e)this.bg(n,b,g,e);c.type=e==1?3:5;g.type=e==1?4:6;b.splice(S(b,c),1);b.splice(S(b,g),1);j=true;break}} -}};a.aD=function(){if(this.br)return null;var c=this.bB;c.a5(1);c.az();var j=this.bw.ExtraMode;while(!c.J()){var h=c.H() -;if(ad(h))break;if(h==">"){var b=az(c.W(),j),e=null;if(ah(b)){var g;if(b.toLowerCase().substr(0,7)=="mailto:")g=b.substr -(7);else{g=b;b="mailto:"+b}e=new am(new C("auto",b,null),g)}else if(al(b))e=new am(new C("auto",b,null),b);if(e!=null){c -.a5(1);return this.O(9,e)}return null}c.a2(j)}return null};a.aI=function(){var b=this.bB,h=b.aW("!")?10:9;if(!b.aW("[")) -return null;var o=this.by;if(this.bw.ExtraMode&&h==9&&b.aW("^")){b.a8();b.az();var m=b.a4();if(m!=null&&b.aW("]")){var s -=this.bw.Q(m);if(s>=0)return this.O(14,{index:s,id:m})}this.by=o}if(this.br&&h==9)return null;var r=this.bw.ExtraMode;b. -az();var j=1;while(!b.J()){var p=b.H();if(p=="[")j++;else if(p=="]"){j--;if(j==0)break}b.a2(r)}if(b.J())return null;var -n=az(b.W(),r);b.a5(1);o=b.by;if(b.aW("(")){var t=ar(b,null,this.bw.ExtraMode);if(t==null)return null;b.bd();if(!b.aW(")" -))return null;return this.O(h,new am(t,n))}if(!b.aW(" "))b.aW("\t");if(b.Y()){b.aZ();b.a8()}var c=null;if(b.H()=="["){b. -a5(1);b.az();if(!b.Z("]"))return null;c=b.W();b.a5(1)}else b.by=o;if(!c){c=n;while(true){var k=c.indexOf("\n");if(k<0) -break;var g=k;while(g>0&&ad(c.charAt(g-1)))g--;var e=k;while(e')}else b.x(">")}else b.x("");c.bz.ae(b,this.E,this.R,this.N);b.x("\n");break;case 14:b.x("
\n"); -return;case 10:case 11:b.x("
  • ");c.bz.ae(b,this.E,this.R,this.N);b.x("
    • \n");break;case 15:b.x(this.E.substr(this.R -,this.N));return;case 16:b.au(this.E,this.R,this.N);return;case 18:b.x("");var h=b;if(c.FormatCodeBlock){h=b;b=new F()}for(var e=0;e\n\n");return;case 9:b.x("
    \n");this.aN(c,b);b.x("
    \n");return;case 19:b.x( -"
  • \n");this.aN(c,b);b.x("
    • \n");return;case 20:b.x("
      \n");this.aN(c,b);b.x("
    \n");return;case 21:b.x( -"
      \n");this.aN(c,b);b.x("
    \n");return;case 22:var g=this.X,n=g.name.toLowerCase();if(n=="a")c.OnPrepareLink(g); -else if(n=="img")c.OnPrepareImage(g,c.RenderingTitledImage);g.aS(b);b.x("\n");this.aN(c,b);g.aO(b);b.x("\n");return;case - 23:case 28:this.aN(c,b);return;case 24:this.X.l(c,b);return;case 25:b.x("
    ");if(this.C!=null){b.x("\n");this.aN(c,b) -}else c.bz.ae(b,this.E,this.R,this.N);b.x("
    \n");break;case 26:if(this.C==null){var m=this.an().split("\n");for(var -e=0;e");c.bz.af(b,ay(o));b.x("\n")}}else{b.x("
    \n");this.aN(c,b);b.x( -"
    \n")}break;case 27:b.x("
    \n");this.aN(c,b);b.x("
    \n");return;case 29:b.x("

    ");if(this.N>0){c.bz.ae(b,this -.E,this.R,this.N);b.x(" ")}b.x(this.X);b.x("

    \n");break}};a.aY=function(){this.v=12;this.R=this.ay;this.N=this. -aA};a.ao=function(){return this.R+this.N};a.a3=function(b){this.N=b-this.R};a.aq=function(){var c=0;for(var b=this.ay;b< -this.ay+this.aA;b++)if(this.E.charAt(b)==" ")c++;else break;return c};a.V=function(b){this.v=b.v;this.E=b.E;this.R=b.R; -this.N=b.N;this.ay=b.ay;this.aA=b.aA;return this};function D(b,c){this.bw=b;this.bx=0;this.bo=c}a=D.prototype;a.aH= -function(c){var b=new G(c);return this.a1(b)};a.aL=function(g,e,b){var c=new G(g,e,b);return this.a1(c)};a.bi=function(b -,c,e){if(e.length>1)return false;if(e.length==1){var g=b.by;b.by=e[0].ay;c.bu=c.aG(b);if(c.bu==null)return false;b.by=g; -e.length=0}while(true){var g=b.by,h=c.aG(b);if(h!=null){c.bA.push(h);continue}b.by=g;break}return true};a.a1=function(j) -{var e=[],c=[],k=-1;while(!j.J()){var m=k==0,b=this.ab(j);k=b.v;if(b.v==25)b.X=m;if(b.v==7||b.v==8){if(c.length>0){var g -=c.pop();this.S(e,c);if(g.v!=0){g.aY();g.v=b.v==7?1:2;e.push(g);continue}}if(b.v==7){b.aY();c.push(b)}else if(b.N>=3){b. -v=14;e.push(b)}else{b.aY();c.push(b)}continue}var h=c.length>0?c[0].v:0;if(b.v==24){var o=b.X,n=j.by;if(!this.bi(j,o,c)) -{j.by=n;b.aY()}else{e.push(b);continue}}switch(b.v){case 0:switch(h){case 0:this.ai(b);break;case 12:this.S(e,c);this.ai -(b);break;case 9:case 10:case 11:case 25:case 28:case 13:c.push(b);break}break;case 12:switch(h){case 0:case 12:c.push(b -);break;case 9:case 10:case 11:case 25:case 28:var g=c[c.length-1];if(g.v==0){this.S(e,c);c.push(b)}else c.push(b);break -;case 13:this.S(e,c);c.push(b);break}break;case 13:switch(h){case 0:c.push(b);break;case 12:case 9:var g=c[c.length-1]; -if(g.v==0){this.S(e,c);c.push(b)}else{b.aY();c.push(b)}break;case 10:case 11:case 13:case 25:case 28:c.push(b);break} -break;case 9:if(h!=9)this.S(e,c);c.push(b);break;case 10:case 11:switch(h){case 0:c.push(b);break;case 12:case 9:var g=c -[c.length-1];if(g.v==0||this.bx==10||this.bx==11||this.bx==25){this.S(e,c);c.push(b)}else{b.aY();c.push(b)}break;case 10 -:case 11:if(b.v!=10&&b.v!=11)this.S(e,c);c.push(b);break;case 25:case 28:if(b.v!=h)this.S(e,c);c.push(b);break;case 13: -this.S(e,c);c.push(b);break}break;case 25:case 28:switch(h){case 0:case 12:case 25:case 28:this.S(e,c);c.push(b);break; -default:b.aY();c.push(b);break}break;default:this.S(e,c);e.push(b);break}}this.S(e,c);if(this.bw.ExtraMode)this.I(e); -return e};a.T=function(c){var b;if(this.bw.bC.length>1)b=this.bw.bC.pop();else b=new B();b.ay=c;return b};a.ai=function( -b){this.bw.bC.push(b)};a.aj=function(b){for(var c=0;c0&&b[b.length-1].v==0)this.ai(b.pop());if(b.length==0)return;switch(b[0].v){case 12:var h=this.T(b[ -0].ay);h.v=12;h.E=b[0].E;h.R=b[0].R;h.a3(b[b.length-1].ao());c.push(h);this.aj(b);break;case 9:var p=this.aQ(b),o=new D( -this.bw,this.bo);o.bx=9;var n=this.T(b[0].ay);n.v=9;n.C=o.aH(p);this.aj(b);c.push(n);break;case 10:case 11:c.push(this.M -(b));break;case 25:if(c.length>0){var j=c[c.length-1];switch(j.v){case 12:j.v=26;break;case 25:break;default:var k=this. -T(j.ay);k.v=26;k.C=[];k.C.push(j);c.pop();c.push(k);break}}c.push(this.G(b));break;case 28:this.bw.z(this.L(b));break; -case 13:var e=this.T(b[0].ay);e.v=18;e.C=[];var g=b[0].an();if(g.substr(0,2)=="{{"&&g.substr(g.length-2,2)=="}}"){e.X=g. -substr(2,g.length-4);b.splice(0,1)}for(var m=0;m6)j=6;b.a8();c.R=b.by;b.bb();if(this.bw.ExtraMode&&!this.bw.SafeMode){var m=at(b.E,c.R,b.by);if(m!=null){c.X=m. -id;b.by=m.end}}while(b.by>c.R&&b.F(-1)=="#")b.a5(-1);while(b.by>c.R&&ad(b.F(-1)))b.a5(-1);c.N=b.by-c.R;b.bb();return 1+j --1}if(e=="-"||e=="="){var k=e;while(b.H()==k)b.a5(1);b.a8();if(b.Y())return k=="="?7:8;b.by=h}if(this.bw.ExtraMode){var -s=av(b);if(s!=null){c.X=s;return 24}b.by=h;if(e=="~"){if(this.aJ(b,c))return c.v;b.by=h}}var g=-1,r=0;while(!b.Y()){if(b -.H()==" "){if(g<0)r++}else if(b.H()=="\t"){if(g<0)g=b.by}else break;b.a5(1)}if(b.Y()){c.N=0;return 0}if(r>=4){c.R=h+4; -return 13}if(g>=0&&g-h<4){c.R=g+1;return 13}c.R=b.by;e=b.H();if(e=="<"){if(this.a0(b,c))return c.v;b.by=c.R}if(e==">"){ -if(ab(b.F(1))){b.a5(2);c.R=b.by;return 9}b.a5(1);c.R=b.by;return 9}if(e=="-"||e=="_"||e=="*"){var o=0;while(!b.Y()){var -k=b.H();if(b.H()==e){o++;b.a5(1);continue}if(ab(b.H())){b.a5(1);continue}break}if(b.Y()&&o>=3)return 14;b.by=c.R}if(this -.bw.ExtraMode&&e=="*"&&b.F(1)=="["){b.a5(2);b.a8();b.az();while(!b.Y()&&b.H()!="]")b.a5(1);var n=ay(b.W());if(b.H()=="]" -&&b.F(1)==":"&&n){b.a5(2);b.a8();b.az();b.bb();var v=b.W();this.bw.y(n,v);return 0}b.by=c.R}if((e=="*"||e=="+"||e=="-") -&&ab(b.F(1))){b.a5(1);b.a8();c.R=b.by;return 11}if(e==":"&&this.bw.ExtraMode&&ab(b.F(1))){b.a5(1);b.a8();c.R=b.by; -return 25}if(X(e)){b.a5(1);while(X(b.H()))b.a5(1);if(b.aW(".")&&b.a8()){c.R=b.by;return 10}b.by=c.R}if(e=="["){if(this. -bw.ExtraMode&&b.F(1)=="^"){var t=b.by;b.a5(2);var p=b.a4();if(p!=null&&b.aW("]")&&b.aW(":")){b.a8();c.R=b.by;c.X=p; -return 28}b.by=t}var q=an(b,this.bw.ExtraMode);if(q!=null){this.bw.A(q);return 0}}return 12};a.ar=function(c){var b=c. -attributes.markdown;if(b==undefined)if(this.bo)return 3;else return 0;delete c.attributes.markdown;if(b=="1")return(c.ap -()&8)!=0?2:1;if(b=="block")return 1;if(b=="deep")return 3;if(b=="span")return 2;return 4};a.aK=function(b,e,o,m){var g=b -.by,k=1,j=false;while(!b.J()){if(!b.Z("<"))break;var n=b.by,h=ag(b);if(h==null){b.a5(1);continue}if(this.bw.SafeMode&&m -==4&&!j)if(!h.at())j=true;if(h.closed)continue;if(h.name==o.name)if(h.closing){k--;if(k==0){b.a8();b.aZ();e.v=22;e.X=o;e -.a3(b.by);switch(m){case 2:var c=this.T(g);c.E=b.E;c.v=17;c.R=g;c.N=n-g;e.C=[];e.C.push(c);break;case 1:case 3:var p=new - D(this.bw,m==3);e.C=p.aL(b.E,g,n-g);break;case 4:if(j){e.v=16;e.a3(b.by)}else{var c=this.T(g);c.E=b.E;c.v=15;c.R=g;c.N= -n-g;e.C=[];e.C.push(c)}break}return true}}else k++}return false};a.a0=function(b,c){var g=b.by,h=ag(b);if(h==null) -return false;if(h.closing)return false;var m=false;if(this.bw.SafeMode&&!h.at())m=true;var q=h.ap();if((q&1)==0) -return false;if((q&4)!=0||h.closed){b.a8();b.aZ();c.N=b.by-c.R;c.v=m?16:15;return true}if((q&2)!=0){b.a8();if(!b.Y()) -return false}var o=this.bw.ExtractHeadBlocks&&h.name.toLowerCase()=="head",t=b.by;if(!o&&this.bw.ExtraMode){var n=this. -ar(h);if(n!=0)return this.aK(b,c,h,n)}var k=null,p=1;while(!b.J()){if(!b.Z("<"))break;var s=b.by,j=ag(b);if(j==null){b. -a5(1);continue}if(this.bw.SafeMode&&!j.at())m=true;if(j.closed)continue;if(!o&&!j.closing&&this.bw.ExtraMode&&!m){var n= -this.ar(j);if(n!=0){var r=this.T(g);if(this.aK(b,r,j,n)){if(k==null)k=[];if(s>g){var e=this.T(g);e.E=b.E;e.v=15;e.R=g;e. -N=s-g;k.push(e)}k.push(r);g=b.by;continue}else this.ai(r)}}if(j.name==h.name&&!j.closed)if(j.closing){p--;if(p==0){b.a8( -);b.aZ();if(m){c.v=16;c.a3(b.by);return true}if(k!=null){if(b.by>g){var e=this.T(g);e.E=b.E;e.v=15;e.R=g;e.N=b.by-g;k. -push(e)}c.v=23;c.a3(b.by);c.C=k;return true}if(o){var v=b.E.substr(t,s-t);this.bw.HeadBlockContent=this.bw. -HeadBlockContent+ay(v)+"\n";c.v=15;c.R=b.bK;c.contentEnd=b.bK;c.ay=b.bK;return true}c.v=15;c.N=b.by-c.R;return true}} -else p++}return 0};a.M=function(b){var r=b[0].v,t=b[0].aq();for(var c=1;ct){b[c].v=13;var v=b[c].ao();b[c].R=b[c].ay+s;b[c].a3(v)}}}var h=this.T(0);h.v=r==11?21:20;h.C=[];for( -var c=0;c0&&b[k-1].v==0)k--;var g=c;while(g");h.bz.af(b,e[c]);b.x("\n")}};a.l=function(e,b){b.x("\n");if( -this.bu!=null){b.x("\n\n");this.aT(e,b,this.bu,"th");b.x("\n\n")}b.x("\n");for(var c=0;c< -this.bA.length;c++){var g=this.bA[c];b.x("\n");this.aT(e,b,g,"td");b.x("\n")}b.x("\n");b.x("
    \n" -)};function av(b){b.a8();if(b.H()!="|"&&b.H()!=":"&&b.H()!="-")return null;var c=null;if(b.aW("|")){c=new H();c.ax=true} -while(true){b.a8();if(b.H()=="|")return null;var g=b.aW(":");while(b.H()=="-")b.a5(1);var h=b.aW(":");b.a8();var e=0;if( -g&&h)e=3;else if(g)e=1;else if(h)e=2;if(b.Y()){if(c==null)return null;c.bp.push(e);return c}if(!b.aW("|"))return null; -if(c==null)c=new H();c.bp.push(e);b.a8();if(b.Y()){c.bk=true;return c}}}this.Markdown=i;this.HtmlTag=w})(); -// MarkdownDeep - http://www.toptensoftware.com/markdowndeep -// Copyright (C) 2010-2011 Topten Software -var MarkdownDeepEditor=new(function(){var q=false,w={Z:"undo",Y:"redo",B:"bold",I:"italic",H:"heading",K:"code",U: -"ullist",O:"ollist",Q:"indent",E:"outdent",L:"link",G:"img",R:"hr","0":"h0","1":"h1","2":"h2","3":"h3","4":"h4","5":"h5" -,"6":"h6"};function A(d,b){return d.substr(0,b.length)==b}function t(d,b){return d.substr(-b.length)==b}function v(b){ -return b==" "||b=="\t"||b=="\r"||b=="\n"}function x(b){return b=="\r"||b=="\n"}function y(e){var b=0,d=e.length;while(b< -d&&v(e.charAt(b)))b++;while(d-1>b&&v(e.charAt(d-1)))d--;return e.substr(b,d-b)}function s(b,d,e){if(b.addEventListener)b -.addEventListener(d,e,false);else if(b.attachEvent)b.attachEvent("on"+d,e)}function B(b,d,e){if(b.removeEventListener)b. -removeEventListener(d,e,false);else if(b.detachEvent)b.detachEvent("on"+d,e)}function u(b){if(b.preventDefault)b. -preventDefault();if(b.cancelBubble!==undefined){b.cancelBubble=true;b.keyCode=0;b.returnValue=false}return false} -function z(d,b){return b-d.value.slice(0,b).split("\r\n").length+1}function p(){}a=p.prototype;a.D=function(b){this.aa=b -;if(q){var d=document.selection.createRange(),f=d.duplicate();f.moveToElementText(b);var e=-f.moveStart("character",- -10000000);this.Z=-d.moveStart("character",-10000000)-e;this.Y=-d.moveEnd("character",-10000000)-e;this.ad=b.value. -replace(/\r\n/gm,"\n")}else{this.Z=b.selectionStart;this.Y=b.selectionEnd;this.ad=b.value}};a.u=function(){var b=new p() -;b.aa=this.aa;b.Y=this.Y;b.Z=this.Z;b.ad=this.ad;return b};a.m=function(){if(q){this.aa.value=this.ad;this.aa.focus(); -var b=this.aa.createTextRange();b.collapse(true);b.moveEnd("character",this.Y);b.moveStart("character",this.Z);b.select( -)}else{var d=this.aa.scrollTop;this.aa.value=this.ad;this.aa.focus();this.aa.setSelectionRange(this.Z,this.Y);this.aa. -scrollTop=d}};a.J=function(b){this.ad=this.ad.substr(0,this.Z)+b+this.ad.substr(this.Y);this.Y=this.Z+b.length};function - r(b,d,e,f){if(b=b.length&&this.ad.substr(this.Z-b.length,b.length -)==b};a.s=function(b){return this.ad.substr(this.Y,b.length)==b};a.U=function(){while(v(this.ad.charAt(this.Z)))this.Z++ -;while(this.Y>this.Z&&v(this.ad.charAt(this.Y-1)))this.Y--};a.E=function(b){return b==0||x(this.ad.charAt(b-1))};a.p= -function(b){while(b>0&&!x(this.ad.charAt(b-1)))b--;return b};a.r=function(b){while(b2&&this.ad.substr(b-2,2)=="\r\n")return b-2;if(b>1&&x(this.ad.charAt(b-1)))return b-1;return b};a.M= -function(){this.Z=this.p(this.Z);if(!this.E(this.Y))this.Y=this.P(this.r(this.Y))};a.S=function(b){while(b>0&&v(this.ad. -charAt(b-1)))b--;return b};a.Q=function(b){while(v(this.ad.charAt(b)))b++;return b};a.L=function(){this.Z=this.S(this.Z) -;this.Y=this.Q(this.Y)};a.o=function(){var d=this.t(),b=d.match(/\n[ \t\r]*\n/);if(b){alert( -"Please make a selection that doesn't include a paragraph break");return false}return true};a.B=function(f){var e=this. -ad.length;for(var b=f;b0){var d=this.p(this.R(b));if(d==0)break;if(this.B(d)) -break;b=d}if(this.q(b).af!=0){b=this.p(e);while(b>0){if(this.q(b).af!=0)return b;b=this.p(this.R(b))}}return b};a.v= -function(b){while(b0){if(this.ae==this.ag.length){this.n();this.ae--}this.ae--;this.ag[this.ae].m();this.ac=0;this.H( -)}};c.cmd_redo=function(){if(this.ae+10)this.x(b, -true);else{var e=b.p(b.Z),d;for(d=e;d0){this.x(b,false);return true} -return false};a.k=function(d,e){var g=d.ad,f=e.length,b=d.t();if(A(b,e)&&t(b,e))d.J(b.substr(f,b.length-f*2));else{d.U() -;b=d.t();if(!b)b="text";else b=b.replace(/(\r\n|\n|\r)/gm,"");d.J(e+b+e);d.C(-f,-f)}return true};c.cmd_bold=function(b){ -if(!b.o())return false;b.U();if(b.G("**"))b.Z-=2;if(b.s("**"))b.Y+=2;return this.k(b,"**")};c.cmd_italic=function(b){if( -!b.o())return false;b.U();if(b.G("*")&&!b.G("**")||b.G("***"))b.Z-=1;if(b.s("*")&&!b.G("**")||b.s("***"))b.Y+=1; -return this.k(b,"*")};a.A=function(b,g){if(false&&b.Z==b.Y){b.L();b.J("\n\n> Quote\n\n");b.Z+=4;b.Y=b.Z+5;return true}b. -M();var e=b.t().split("\n");for(var d=0;d "))f=e[d].substr(2)}else f="> "+ -e[d];e.splice(d,1,f)}b.J(e.join("\n"));return true};c.cmd_indent=function(b){return this.A(b,false)};c.cmd_outdent= -function(b){return this.A(b,true)};a.z=function(b,o){var g=[];if(b.t().indexOf("\n")>0){b.M();var f=b.Z;g.push(f);while( -true){f=b.w(f);if(f>=b.Y)break;g.push(f)}}else g.push(b.p(b.Z));var n=o=="*"?"* ":"1. ";for(var d=0;d=0;d--){var f=g[d],h=b.q(f);b.I(f,h.af,n)}var j=new -MarkdownDeep.Markdown();j.ExtraMode=true;var e=j.GetListItems(b.ad,b.Z);while(e!=null){var i=0;for(var d=0;d1)b.M();return true};c.cmd_ullist= -function(b){return this.z(b,"*")};c.cmd_ollist=function(b){return this.z(b,"1")};c.cmd_link=function(b){b.U();if(!b.o()) -return false;var e=prompt("Enter the target URL:");if(e===null)return false;var d=b.t();if(d.length==0)d="link text";var - f="["+d+"]("+e+")";b.J(f);b.Z++;b.Y=b.Z+d.length;return true};c.cmd_img=function(b){b.U();if(!b.o())return false;var e= -prompt("Enter the image URL");if(e===null)return false;var d=b.t();if(d.length==0)d="Image Text";var f="!["+d+"]("+e+")" -;b.J(f);b.Z+=2;b.Y=b.Z+d.length;return true};c.cmd_hr=function(b){b.L();if(b.Z==0)b.J("----------\n\n");else b.J( -"\n\n----------\n\n");b.Z=b.Y;return true};c.IndentNewLine=function(){var i=this,g,h=function(){window.clearInterval(g); -var b=new p();b.D(i.aa);var e=b.p(b.R(b.Z)),d=e;while(true){var f=b.ad.charAt(d);if(f!=" "&&f!="\t")break;d++}if(d>e){b. -J(b.ad.substr(e,d-e));b.Z=b.Y}b.m()};g=window.setInterval(h,1);return false};c.cmd_indented_newline=function(b){b.J("\n" -);b.Z=b.Y;var e=b.p(b.R(b.Z)),d=e;while(true){var f=b.ad.charAt(d);if(f!=" "&&f!="\t")break;d++}if(d>e){b.J(b.ad.substr( -e,d-e));b.Z=b.Y}return true};c.InvokeCommand=function(b){if(b=="undo"||b=="redo"){this["cmd_"+b]();this.aa.focus(); -return}var d=new p();d.D(this.aa);var e=d.u();if(this["cmd_"+b](d)){this.ac=0;this.ag.splice(this.ae,this.ag.length-this -.ae,e);this.ae++;d.m();this.H();return true}else{this.aa.focus();return false}};delete a;delete c;this.Editor=l})(); -// MarkdownDeep - http://www.toptensoftware.com/markdowndeep -// Copyright (C) 2010-2011 Topten Software -var MarkdownDeepEditorUI=new(function(){this.HelpHtmlWritten=false;this.HelpHtml=function(b){var a="";a+= -'\n";return a};this.ToolbarHtml=function(){var a="";a+='
    \n';a+= -'How to Format\n';a+="
    \n";a+="
      \n";a+= -'
      • \n';a+= -'
      • \n';a+= -'
      • \n';a+= -'
      • \n' -;a+= -'
      • \n' -;a+='
      • \n';a+= -'
      • \n';a+= -'
      • \n';a+= -'
      • \n';a+= -'
      • \n';a+= -'
      • \n';a+= -'
      • \n';a+= -'
      • \n';a+= -'
      • \n';a+= -'
      • \n';a+= -'
      • \n';a+= -'
      • \n';a+= -"
    \n";a+='
    \n';return a};this.onResizerMouseDown=function(a){var h=window.event?a. -srcElement:a.target,f=$(h).closest(".mdd_resizer_wrap").prev(".mdd_editor_wrap").children("textarea")[0],l=a.clientY,k=$ -(f).height();$(document).bind("mousemove.mdd",e);$(document).bind("mouseup.mdd",g);return false;function g(b){$(document -).unbind("mousemove.mdd");$(document).unbind("mouseup.mdd");return false}function e(c){var b=k+c.clientY-l;if(b<50)b=50; -$(f).height(b);return false}};var j=0,i=false;this.onShowHelpPopup=function(){$("#mdd_syntax_container").fadeIn("fast"); -$(".modal_content").scrollTop(j);$(document).bind("keydown.mdd",function(k){if(k.keyCode==27){MarkdownDeepEditorUI. -onCloseHelpPopup();return false}});if(!i){i=true;var a=$("#mdd_help_location").attr("href");if(!a)a="mdd_help.htm";$( -"#mdd_syntax").load(a)}return false};this.onCloseHelpPopup=function(){j=$(".modal_content").scrollTop();$( -"#mdd_syntax_container").fadeOut("fast");$(document).unbind("keydown.mdd");$(document).unbind("scroll.mdd");return false -};this.onToolbarButton=function(a){var b=$(a.target).closest("div.mdd_toolbar_wrap").next(".mdd_editor_wrap").children( -"textarea").data("mdd");b.InvokeCommand($(a.target).attr("id").substr(4));return false}})();(function(a){a.fn. -MarkdownDeep=function(f){var h={resizebar:true,toolbar:true,help_location:"mdd_help.html"};if(f)a.extend(h,f); -return this.each(function(){var d=a(this).parent(".mdd_editor_wrap");if(d.length==0)d=a(this).wrap( -'
    ').parent();if(h.toolbar){var k=d.prev(".mdd_toolbar_wrap"),c=d.prev(".mdd_toolbar");if( -k.length==0){if(c.length==0){c=a('
    ');c.insertBefore(d)}k=c.wrap( -'
    ').parent()}else if(c.length==0){c=a('
    ');k.html(c)}c.append( -a(MarkdownDeepEditorUI.ToolbarHtml()));a("a.mdd_button",c).click(MarkdownDeepEditorUI.onToolbarButton);a("a.mdd_help",c) -.click(MarkdownDeepEditorUI.onShowHelpPopup);if(!MarkdownDeepEditorUI.HelpHtmlWritten){var l=a(MarkdownDeepEditorUI. -HelpHtml(h.help_location));l.appendTo(a("body"));a("#mdd_close_help").click(MarkdownDeepEditorUI.onCloseHelpPopup); -MarkdownDeepEditorUI.HelpHtmlWritten=true}}var b,e;if(h.resizebar){e=d.next(".mdd_resizer_wrap"),b=e.length==0?d.next( -".mdd_resizer"):e.children(".mdd_resizer");if(e.length==0){if(b.length==0){b=a('
    ');b. -insertAfter(d)}e=b.wrap('
    ').parent()}else if(b.length==0){b=a( -'
    ');e.html(b)}e.bind("mousedown",MarkdownDeepEditorUI.onResizerMouseDown)}var j=a(this).attr( -"data-mdd-preview");if(!j)j=".mdd_preview";var i=a(j)[0];if(!i){a('
    ').insertAfter(b?b: -this);i=a(".mdd_preview")[0]}var g=new MarkdownDeepEditor.Editor(this,i);if(f){jQuery.extend(g.Markdown,f);jQuery.extend -(g,f)}g.onOptionsChanged();a(this).data("mdd",g)})}})(jQuery) \ No newline at end of file diff --git a/web/Scripts/hallo.js b/web/Scripts/hallo.js new file mode 100644 index 00000000..c0f16862 --- /dev/null +++ b/web/Scripts/hallo.js @@ -0,0 +1,3206 @@ +/* Hallo 1.1.1 - rich text editor for jQuery UI +* by Henri Bergius and contributors. Available under the MIT license. +* See http://hallojs.org for more information +*/(function() { + (function(jQuery) { + return jQuery.widget('IKS.hallo', { + toolbar: null, + bound: false, + originalContent: '', + previousContent: '', + uuid: '', + selection: null, + _keepActivated: false, + originalHref: null, + options: { + editable: true, + plugins: {}, + toolbar: 'halloToolbarContextual', + parentElement: 'body', + buttonCssClass: null, + toolbarCssClass: null, + toolbarPositionAbove: false, + toolbarOptions: {}, + placeholder: '', + forceStructured: true, + checkTouch: true, + touchScreen: null + }, + _create: function() { + var options, plugin, _ref, + _this = this; + this.id = this._generateUUID(); + if (this.options.checkTouch && this.options.touchScreen === null) { + this.checkTouch(); + } + _ref = this.options.plugins; + for (plugin in _ref) { + options = _ref[plugin]; + if (!jQuery.isPlainObject(options)) { + options = {}; + } + jQuery.extend(options, { + editable: this, + uuid: this.id, + buttonCssClass: this.options.buttonCssClass + }); + jQuery(this.element)[plugin](options); + } + this.element.one('halloactivated', function() { + return _this._prepareToolbar(); + }); + return this.originalContent = this.getContents(); + }, + _init: function() { + if (this.options.editable) { + return this.enable(); + } else { + return this.disable(); + } + }, + destroy: function() { + var options, plugin, _ref; + this.disable(); + if (this.toolbar) { + this.toolbar.remove(); + this.element[this.options.toolbar]('destroy'); + } + _ref = this.options.plugins; + for (plugin in _ref) { + options = _ref[plugin]; + jQuery(this.element)[plugin]('destroy'); + } + return jQuery.Widget.prototype.destroy.call(this); + }, + disable: function() { + var _this = this; + this.element.attr("contentEditable", false); + this.element.off("focus", this._activated); + this.element.off("blur", this._deactivated); + this.element.off("keyup paste change", this._checkModified); + this.element.off("keyup", this._keys); + this.element.off("keyup mouseup", this._checkSelection); + this.bound = false; + jQuery(this.element).removeClass('isModified'); + jQuery(this.element).removeClass('inEditMode'); + this.element.parents('a').addBack().each(function(idx, elem) { + var element; + element = jQuery(elem); + if (!element.is('a')) { + return; + } + if (!_this.originalHref) { + return; + } + return element.attr('href', _this.originalHref); + }); + return this._trigger("disabled", null); + }, + enable: function() { + var _this = this; + this.element.parents('a[href]').addBack().each(function(idx, elem) { + var element; + element = jQuery(elem); + if (!element.is('a[href]')) { + return; + } + _this.originalHref = element.attr('href'); + return element.removeAttr('href'); + }); + this.element.attr("contentEditable", true); + if (!jQuery.parseHTML(this.element.html())) { + this.element.html(this.options.placeholder); + jQuery(this.element).addClass('inPlaceholderMode'); + this.element.css({ + 'min-width': this.element.innerWidth(), + 'min-height': this.element.innerHeight() + }); + } + if (!this.bound) { + this.element.on("focus", this, this._activated); + this.element.on("blur", this, this._deactivated); + this.element.on("keyup paste change", this, this._checkModified); + this.element.on("keyup", this, this._keys); + this.element.on("keyup mouseup", this, this._checkSelection); + this.bound = true; + } + if (this.options.forceStructured) { + this._forceStructured(); + } + return this._trigger("enabled", null); + }, + activate: function() { + return this.element.focus(); + }, + containsSelection: function() { + var range; + range = this.getSelection(); + return this.element.has(range.startContainer).length > 0; + }, + getSelection: function() { + var range, sel; + sel = rangy.getSelection(); + range = null; + if (sel.rangeCount > 0) { + range = sel.getRangeAt(0); + } else { + range = rangy.createRange(); + } + return range; + }, + restoreSelection: function(range) { + var sel; + sel = rangy.getSelection(); + return sel.setSingleRange(range); + }, + replaceSelection: function(cb) { + var newTextNode, r, range, sel, t; + if (navigator.appName === 'Microsoft Internet Explorer') { + t = document.selection.createRange().text; + r = document.selection.createRange(); + return r.pasteHTML(cb(t)); + } else { + sel = window.getSelection(); + range = sel.getRangeAt(0); + newTextNode = document.createTextNode(cb(range.extractContents())); + range.insertNode(newTextNode); + range.setStartAfter(newTextNode); + sel.removeAllRanges(); + return sel.addRange(range); + } + }, + removeAllSelections: function() { + if (navigator.appName === 'Microsoft Internet Explorer') { + return range.empty(); + } else { + return window.getSelection().removeAllRanges(); + } + }, + getPluginInstance: function(plugin) { + var instance; + instance = jQuery(this.element).data("IKS-" + plugin); + if (instance) { + return instance; + } + instance = jQuery(this.element).data(plugin); + if (instance) { + return instance; + } + throw new Error("Plugin " + plugin + " not found"); + }, + getContents: function() { + var cleanup, instance, plugin; + for (plugin in this.options.plugins) { + instance = this.getPluginInstance(plugin); + if (!instance) { + continue; + } + cleanup = instance.cleanupContentClone; + if (!jQuery.isFunction(cleanup)) { + continue; + } + jQuery(this.element)[plugin]('cleanupContentClone', this.element); + } + return this.element.html(); + }, + setContents: function(contents) { + return this.element.html(contents); + }, + isModified: function() { + if (!this.previousContent) { + this.previousContent = this.originalContent; + } + return this.previousContent !== this.getContents(); + }, + setUnmodified: function() { + jQuery(this.element).removeClass('isModified'); + return this.previousContent = this.getContents(); + }, + setModified: function() { + jQuery(this.element).addClass('isModified'); + return this._trigger('modified', null, { + editable: this, + content: this.getContents() + }); + }, + restoreOriginalContent: function() { + return this.element.html(this.originalContent); + }, + execute: function(command, value) { + if (document.execCommand(command, false, value)) { + return this.element.trigger("change"); + } + }, + protectFocusFrom: function(el) { + var _this = this; + return el.on("mousedown", function(event) { + event.preventDefault(); + _this._protectToolbarFocus = true; + return setTimeout(function() { + return _this._protectToolbarFocus = false; + }, 300); + }); + }, + keepActivated: function(_keepActivated) { + this._keepActivated = _keepActivated; + }, + _generateUUID: function() { + var S4; + S4 = function() { + return ((1 + Math.random()) * 0x10000 | 0).toString(16).substring(1); + }; + return "" + (S4()) + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + (S4()) + (S4()); + }, + _prepareToolbar: function() { + var defaults, instance, plugin, populate, toolbarOptions; + this.toolbar = jQuery('
    ').hide(); + if (this.options.toolbarCssClass) { + this.toolbar.addClass(this.options.toolbarCssClass); + } + defaults = { + editable: this, + parentElement: this.options.parentElement, + toolbar: this.toolbar, + positionAbove: this.options.toolbarPositionAbove + }; + toolbarOptions = jQuery.extend({}, defaults, this.options.toolbarOptions); + this.element[this.options.toolbar](toolbarOptions); + for (plugin in this.options.plugins) { + instance = this.getPluginInstance(plugin); + if (!instance) { + continue; + } + populate = instance.populateToolbar; + if (!jQuery.isFunction(populate)) { + continue; + } + this.element[plugin]('populateToolbar', this.toolbar); + } + this.element[this.options.toolbar]('setPosition'); + return this.protectFocusFrom(this.toolbar); + }, + changeToolbar: function(element, toolbar, hide) { + var originalToolbar; + if (hide == null) { + hide = false; + } + originalToolbar = this.options.toolbar; + this.options.parentElement = element; + if (toolbar) { + this.options.toolbar = toolbar; + } + if (!this.toolbar) { + return; + } + this.element[originalToolbar]('destroy'); + this.toolbar.remove(); + this._prepareToolbar(); + if (hide) { + return this.toolbar.hide(); + } + }, + _checkModified: function(event) { + var widget; + widget = event.data; + if (widget.isModified()) { + return widget.setModified(); + } + }, + _keys: function(event) { + var old, widget; + widget = event.data; + if (event.keyCode === 27) { + old = widget.getContents(); + widget.restoreOriginalContent(event); + widget._trigger("restored", null, { + editable: widget, + content: widget.getContents(), + thrown: old + }); + return widget.turnOff(); + } + }, + _rangesEqual: function(r1, r2) { + if (r1.startContainer !== r2.startContainer) { + return false; + } + if (r1.startOffset !== r2.startOffset) { + return false; + } + if (r1.endContainer !== r2.endContainer) { + return false; + } + if (r1.endOffset !== r2.endOffset) { + return false; + } + return true; + }, + _checkSelection: function(event) { + var widget; + if (event.keyCode === 27) { + return; + } + widget = event.data; + return setTimeout(function() { + var sel; + sel = widget.getSelection(); + if (widget._isEmptySelection(sel) || widget._isEmptyRange(sel)) { + if (widget.selection) { + widget.selection = null; + widget._trigger("unselected", null, { + editable: widget, + originalEvent: event + }); + } + return; + } + if (!widget.selection || !widget._rangesEqual(sel, widget.selection)) { + widget.selection = sel.cloneRange(); + return widget._trigger("selected", null, { + editable: widget, + selection: widget.selection, + ranges: [widget.selection], + originalEvent: event + }); + } + }, 0); + }, + _isEmptySelection: function(selection) { + if (selection.type === "Caret") { + return true; + } + return false; + }, + _isEmptyRange: function(range) { + if (range.collapsed) { + return true; + } + if (range.isCollapsed) { + if (typeof range.isCollapsed === 'function') { + return range.isCollapsed(); + } + return range.isCollapsed; + } + return false; + }, + turnOn: function() { + if (this.getContents() === this.options.placeholder) { + this.setContents(''); + } + jQuery(this.element).removeClass('inPlaceholderMode'); + jQuery(this.element).addClass('inEditMode'); + return this._trigger("activated", null, this); + }, + turnOff: function() { + jQuery(this.element).removeClass('inEditMode'); + this._trigger("deactivated", null, this); + if (!this.getContents()) { + jQuery(this.element).addClass('inPlaceholderMode'); + return this.setContents(this.options.placeholder); + } + }, + _activated: function(event) { + return event.data.turnOn(); + }, + _deactivated: function(event) { + if (event.data._keepActivated) { + return; + } + if (event.data._protectToolbarFocus !== true) { + return event.data.turnOff(); + } else { + return setTimeout(function() { + return jQuery(event.data.element).focus(); + }, 300); + } + }, + _forceStructured: function(event) { + var e; + try { + return document.execCommand('styleWithCSS', 0, false); + } catch (_error) { + e = _error; + try { + return document.execCommand('useCSS', 0, true); + } catch (_error) { + e = _error; + try { + return document.execCommand('styleWithCSS', false, false); + } catch (_error) { + e = _error; + } + } + } + }, + checkTouch: function() { + return this.options.touchScreen = !!('createTouch' in document); + } + }); + })(jQuery); + +}).call(this); + +(function() { + (function(jQuery) { + var z; + z = null; + if (this.VIE !== void 0) { + z = new VIE; + z.use(new z.StanbolService({ + proxyDisabled: true, + url: 'http://dev.iks-project.eu:8081' + })); + } + return jQuery.widget('IKS.halloannotate', { + options: { + vie: z, + editable: null, + toolbar: null, + uuid: '', + select: function() {}, + decline: function() {}, + remove: function() {}, + buttonCssClass: null + }, + _create: function() { + var editableElement, turnOffAnnotate, widget; + widget = this; + if (this.options.vie === void 0) { + throw new Error('The halloannotate plugin requires VIE'); + return; + } + if (typeof this.element.annotate !== 'function') { + throw new Error('The halloannotate plugin requires annotate.js'); + return; + } + this.state = 'off'; + this.instantiate(); + turnOffAnnotate = function() { + var editable; + editable = this; + return jQuery(editable).halloannotate('turnOff'); + }; + editableElement = this.options.editable.element; + return editableElement.on('hallodisabled', turnOffAnnotate); + }, + populateToolbar: function(toolbar) { + var buttonHolder, + _this = this; + buttonHolder = jQuery(""); + this.button = buttonHolder.hallobutton({ + label: 'Annotate', + icon: 'fa-tags', + editable: this.options.editable, + command: null, + uuid: this.options.uuid, + cssClass: this.options.buttonCssClass, + queryState: false + }); + buttonHolder.on('change', function(event) { + if (_this.state === "pending") { + return; + } + if (_this.state === "off") { + return _this.turnOn(); + } + return _this.turnOff(); + }); + buttonHolder.buttonset(); + return toolbar.append(this.button); + }, + cleanupContentClone: function(el) { + if (this.state === 'on') { + return el.find(".entity:not([about])").each(function() { + return jQuery(this).replaceWith(jQuery(this).html()); + }); + } + }, + instantiate: function() { + var widget; + widget = this; + return this.options.editable.element.annotate({ + vie: this.options.vie, + debug: false, + showTooltip: true, + select: this.options.select, + remove: this.options.remove, + success: this.options.success, + error: this.options.error + }).on('annotateselect', function(event, data) { + return widget.options.editable.setModified(); + }).on('annotateremove', function() { + return jQuery.noop(); + }); + }, + turnPending: function() { + this.state = 'pending'; + this.button.hallobutton('checked', false); + return this.button.hallobutton('disable'); + }, + turnOn: function() { + var e, widget, + _this = this; + this.turnPending(); + widget = this; + try { + return this.options.editable.element.annotate('enable', function(success) { + if (!success) { + return; + } + _this.state = 'on'; + _this.button.hallobutton('checked', true); + return _this.button.hallobutton('enable'); + }); + } catch (_error) { + e = _error; + return alert(e); + } + }, + turnOff: function() { + this.options.editable.element.annotate('disable'); + this.state = 'off'; + if (!this.button) { + return; + } + this.button.attr('checked', false); + this.button.find("label").removeClass("ui-state-clicked"); + return this.button.button('refresh'); + } + }); + })(jQuery); + +}).call(this); + +(function() { + (function(jQuery) { + return jQuery.widget('IKS.halloblacklist', { + options: { + tags: [] + }, + _init: function() { + if (this.options.tags.indexOf('br') !== -1) { + return this.element.on('keydown', function(event) { + if (event.originalEvent.keyCode === 13) { + return event.preventDefault(); + } + }); + } + }, + cleanupContentClone: function(el) { + var tag, _i, _len, _ref, _results; + _ref = this.options.tags; + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + tag = _ref[_i]; + _results.push(jQuery(tag, el).remove()); + } + return _results; + } + }); + })(jQuery); + +}).call(this); + +(function() { + (function(jQuery) { + return jQuery.widget('IKS.halloblock', { + options: { + editable: null, + toolbar: null, + uuid: '', + elements: ['h1', 'h2', 'h3', 'p', 'pre', 'blockquote'], + buttonCssClass: null + }, + populateToolbar: function(toolbar) { + var buttonset, contentId, target; + buttonset = jQuery(""); + contentId = "" + this.options.uuid + "-" + this.widgetName + "-data"; + target = this._prepareDropdown(contentId); + toolbar.append(buttonset); + buttonset.hallobuttonset(); + buttonset.append(target); + return buttonset.append(this._prepareButton(target)); + }, + _prepareDropdown: function(contentId) { + var addElement, containingElement, contentArea, element, _i, _len, _ref, + _this = this; + contentArea = jQuery("
    "); + containingElement = this.options.editable.element.get(0).tagName.toLowerCase(); + addElement = function(element) { + var el, events, queryState; + el = jQuery(""); + if (containingElement === element) { + el.addClass('selected'); + } + if (containingElement !== 'div') { + el.addClass('disabled'); + } + el.on('click', function() { + var tagName; + tagName = element.toUpperCase(); + if (el.hasClass('disabled')) { + return; + } + if (navigator.appName === 'Microsoft Internet Explorer') { + _this.options.editable.execute('FormatBlock', "<" + tagName + ">"); + return; + } + return _this.options.editable.execute('formatBlock', tagName); + }); + queryState = function(event) { + var block; + block = document.queryCommandValue('formatBlock'); + if (block.toLowerCase() === element) { + el.addClass('selected'); + return; + } + return el.removeClass('selected'); + }; + events = 'keyup paste change mouseup'; + _this.options.editable.element.on(events, queryState); + _this.options.editable.element.on('halloenabled', function() { + return _this.options.editable.element.on(events, queryState); + }); + _this.options.editable.element.on('hallodisabled', function() { + return _this.options.editable.element.off(events, queryState); + }); + return el; + }; + _ref = this.options.elements; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + element = _ref[_i]; + contentArea.append(addElement(element)); + } + return contentArea; + }, + _prepareButton: function(target) { + var buttonElement; + buttonElement = jQuery(''); + buttonElement.hallodropdownbutton({ + uuid: this.options.uuid, + editable: this.options.editable, + label: 'block', + icon: 'fa-text-height', + target: target, + cssClass: this.options.buttonCssClass + }); + return buttonElement; + } + }); + })(jQuery); + +}).call(this); + +(function() { + (function(jQuery) { + var rangyMessage; + rangyMessage = 'The hallocleanhtml plugin requires the selection save and\ + restore module from Rangy'; + return jQuery.widget('IKS.hallocleanhtml', { + _create: function() { + var editor, + _this = this; + if (jQuery.htmlClean === void 0) { + throw new Error('The hallocleanhtml plugin requires jQuery.htmlClean'); + return; + } + editor = this.element; + return editor.bind('paste', this, function(event) { + var lastContent, lastRange, widget; + if (rangy.saveSelection === void 0) { + throw new Error(rangyMessage); + return; + } + widget = event.data; + widget.options.editable.getSelection().deleteContents(); + lastRange = rangy.saveSelection(); + lastContent = editor.html(); + editor.html(''); + return setTimeout(function() { + var cleanPasted, error, pasted, range; + pasted = editor.html(); + cleanPasted = jQuery.htmlClean(pasted, _this.options); + editor.html(lastContent); + rangy.restoreSelection(lastRange); + if (cleanPasted !== '') { + try { + return document.execCommand('insertHTML', false, cleanPasted); + } catch (_error) { + error = _error; + range = widget.options.editable.getSelection(); + return range.insertNode(range.createContextualFragment(cleanPasted)); + } + } + }, 4); + }); + } + }); + })(jQuery); + +}).call(this); + +(function() { + (function(jQuery) { + return jQuery.widget("IKS.halloformat", { + options: { + editable: null, + uuid: '', + formattings: { + bold: true, + italic: true, + strikeThrough: false, + underline: false + }, + buttonCssClass: null + }, + populateToolbar: function(toolbar) { + var buttonize, buttonset, enabled, format, widget, _ref, + _this = this; + widget = this; + buttonset = jQuery(""); + buttonize = function(format) { + var buttonHolder; + buttonHolder = jQuery(''); + buttonHolder.hallobutton({ + label: format, + editable: _this.options.editable, + command: format, + uuid: _this.options.uuid, + cssClass: _this.options.buttonCssClass + }); + return buttonset.append(buttonHolder); + }; + _ref = this.options.formattings; + for (format in _ref) { + enabled = _ref[format]; + if (!enabled) { + continue; + } + buttonize(format); + } + buttonset.hallobuttonset(); + return toolbar.append(buttonset); + } + }); + })(jQuery); + +}).call(this); + +(function() { + (function(jQuery) { + return jQuery.widget("IKS.halloheadings", { + options: { + editable: null, + uuid: '', + formatBlocks: ["p", "h1", "h2", "h3"], + buttonCssClass: null + }, + populateToolbar: function(toolbar) { + var buttonize, buttonset, command, format, ie, widget, _i, _len, _ref, + _this = this; + widget = this; + buttonset = jQuery(""); + ie = navigator.appName === 'Microsoft Internet Explorer'; + command = (ie ? "FormatBlock" : "formatBlock"); + buttonize = function(format) { + var buttonHolder; + buttonHolder = jQuery(''); + buttonHolder.hallobutton({ + label: format, + editable: _this.options.editable, + command: command, + commandValue: (ie ? "<" + format + ">" : format), + uuid: _this.options.uuid, + cssClass: _this.options.buttonCssClass, + queryState: function(event) { + var compared, e, map, result, val, value, _i, _len, _ref; + try { + value = document.queryCommandValue(command); + if (ie) { + map = { + p: "normal" + }; + _ref = [1, 2, 3, 4, 5, 6]; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + val = _ref[_i]; + map["h" + val] = val; + } + compared = value.match(new RegExp(map[format], "i")); + } else { + compared = value.match(new RegExp(format, "i")); + } + result = compared ? true : false; + return buttonHolder.hallobutton('checked', result); + } catch (_error) { + e = _error; + } + } + }); + buttonHolder.find('button .ui-button-text').text(format.toUpperCase()); + return buttonset.append(buttonHolder); + }; + _ref = this.options.formatBlocks; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + format = _ref[_i]; + buttonize(format); + } + buttonset.hallobuttonset(); + return toolbar.append(buttonset); + } + }); + })(jQuery); + +}).call(this); + +(function() { + (function(jQuery) { + return jQuery.widget("IKS.hallohtml", { + options: { + editable: null, + toolbar: null, + uuid: "", + lang: 'en', + dialogOpts: { + autoOpen: false, + width: 600, + height: 'auto', + modal: false, + resizable: true, + draggable: true, + dialogClass: 'htmledit-dialog' + }, + dialog: null, + buttonCssClass: null + }, + translations: { + en: { + title: 'Edit HTML', + update: 'Update' + }, + de: { + title: 'HTML bearbeiten', + update: 'Aktualisieren' + } + }, + texts: null, + populateToolbar: function($toolbar) { + var $buttonHolder, $buttonset, id, selector, widget; + widget = this; + this.texts = this.translations[this.options.lang]; + this.options.toolbar = $toolbar; + selector = "" + this.options.uuid + "-htmledit-dialog"; + this.options.dialog = jQuery("
    ").attr('id', selector); + $buttonset = jQuery("").addClass(widget.widgetName); + id = "" + this.options.uuid + "-htmledit"; + $buttonHolder = jQuery(''); + $buttonHolder.hallobutton({ + label: this.texts.title, + icon: 'fa-list-alt', + editable: this.options.editable, + command: null, + queryState: false, + uuid: this.options.uuid, + cssClass: this.options.buttonCssClass + }); + $buttonset.append($buttonHolder); + this.button = $buttonHolder; + this.button.click(function() { + if (widget.options.dialog.dialog("isOpen")) { + widget._closeDialog(); + } else { + widget._openDialog(); + } + return false; + }); + this.options.editable.element.on("hallodeactivated", function() { + return widget._closeDialog(); + }); + $toolbar.append($buttonset); + this.options.dialog.dialog(this.options.dialogOpts); + return this.options.dialog.dialog("option", "title", this.texts.title); + }, + _openDialog: function() { + var $editableEl, html, widget, xposition, yposition, + _this = this; + widget = this; + $editableEl = jQuery(this.options.editable.element); + xposition = $editableEl.offset().left + $editableEl.outerWidth() + 10; + yposition = this.options.toolbar.offset().top - jQuery(document).scrollTop(); + this.options.dialog.dialog("option", "position", [xposition, yposition]); + this.options.editable.keepActivated(true); + this.options.dialog.dialog("open"); + this.options.dialog.on('dialogclose', function() { + jQuery('label', _this.button).removeClass('ui-state-active'); + _this.options.editable.element.focus(); + return _this.options.editable.keepActivated(false); + }); + this.options.dialog.html(jQuery("
    +<%=Html.Hidden("Author")%> +<%=Html.Hidden("Id")%> + <% } %> - - -<% if (Model.Id!=0) { %> + +
    - - -<% } %>
    (Id: -<%= Model.Id %>, <%= Model.Posted.ToString("yyyy/MM/dd") %> - <%= Model.Modified.ToString("yyyy/MM/dd") %> <%= Model.Visible? "":", Invisible!" %>) <%= Html.ActionLink("Supprimer","RemovePost", new { user=Model.UserName, title = Model.Title }, new { @class="actionlink" } ) %> +<%= Model.Id %>, <%= Model.Posted.ToString("yyyy/MM/dd") %> - <%= Model.Modified.ToString("yyyy/MM/dd") %> <%= Model.Visible? "":", Invisible!" %>) <%= Html.ActionLink("Supprimer","RemovePost", new { user=Model.Author, title = Model.Title }, new { @class="actionlink" } ) %>
    diff --git a/web/Views/Blogs/RemoveTitle.aspx b/web/Views/Blogs/RemoveTitle.aspx index 48d65db2..2aeee4ff 100644 --- a/web/Views/Blogs/RemoveTitle.aspx +++ b/web/Views/Blogs/RemoveTitle.aspx @@ -8,7 +8,7 @@ <%= Html.LabelFor(model => model.Titles) %> : <%= Html.TextBox( "Titles" ) %> <%= Html.ValidationMessage("Titles", "*") %>
    -<%= Html.Hidden("UserName") %> +<%= Html.Hidden("Author") %> <%= Html.CheckBox( "confirm" ) %> <%= Html.ValidationMessage("AgreeToRemove", "*") %> diff --git a/web/Views/Blogs/UserPost.aspx b/web/Views/Blogs/UserPost.aspx index 802704d1..3c6021ef 100644 --- a/web/Views/Blogs/UserPost.aspx +++ b/web/Views/Blogs/UserPost.aspx @@ -6,8 +6,8 @@

    <% if (ViewData["Avatar"]!=null) { %> " alt="" id="logo"/> <% } %> -<%= Html.ActionLink(Model.Title,"UserPost", new{user=Model.UserName, title = Model.Title}, null) %> - - <%= Html.ActionLink((string)ViewData ["BlogTitle"] ,"UserPosts",new{user=Model.UserName}, null) %> +<%= Html.ActionLink(Model.Title,"UserPost", new{user=Model.Author, title = Model.Title}, null) %> + - <%= Html.ActionLink((string)ViewData ["BlogTitle"] ,"UserPosts",new{user=Model.Author}, null) %> - "><%= YavscHelpers.SiteName %> @@ -18,10 +18,10 @@ <% foreach (var be in Model) { %>
    -<%= Html.Markdown(be.Content) %> +<%= Html.Markdown(be.Content,"/bfiles/"+be.Id+"/") %>
    <% if (Membership.GetUser()!=null) { - if (Membership.GetUser().UserName==be.UserName) + if (Membership.GetUser().UserName==be.Author) { %>
    <%= Html.ActionLink("Editer","Edit", new { id = be.Id }, new { @class="actionlink" }) %> <%= Html.ActionLink("Supprimer","RemovePost", new { id = be.Id }, new { @class="actionlink" } ) %> @@ -31,13 +31,13 @@ <% foreach (var c in (Comment[]) BlogManager.GetComments(be.Id)) { %>
    <%=c.From%> <%= Html.Markdown(c.CommentText) %> - <% if ( username == Model.UserName || c.From == username ) { %> + <% if ( username == Model.Author || c.From == username ) { %> <%= Html.ActionLink("Supprimer","RemoveComment", new { cmtid = c.Id } , new { @class="actionlink" })%> <% } %>
    <% } %>
    <% using (Html.BeginForm("Comment","Blogs")) { %> - <%=Html.Hidden("UserName")%> + <%=Html.Hidden("Author")%> <%=Html.Hidden("Title")%> <%=Html.TextArea("CommentText","")%> <%=Html.Hidden("PostId",be.Id)%> diff --git a/web/Views/Blogs/UserPosts.aspx b/web/Views/Blogs/UserPosts.aspx index ed5ecc09..26dd1566 100644 --- a/web/Views/Blogs/UserPosts.aspx +++ b/web/Views/Blogs/UserPosts.aspx @@ -20,11 +20,11 @@ <% foreach (BlogEntry e in this.Model) { %>
    style="background-color:#022;" <% } %>> -

    <%= Html.ActionLink(e.Title,"UserPost", new { user=e.UserName, title=e.Title, id = e.Id }, new { @class = "usertitleref actionlink" , style="display:block;"}) %>

    +

    <%= Html.ActionLink(e.Title,"UserPost", new { user=e.Author, title=e.Title, id = e.Id }, new { @class = "usertitleref actionlink" , style="display:block;"}) %>

    (<%= e.Posted.ToString("yyyy/MM/dd") %> - <%= e.Modified.ToString("yyyy/MM/dd") %> <%= e.Visible? "":", Invisible!" %>) <% if (Membership.GetUser()!=null) - if (Membership.GetUser().UserName==e.UserName) + if (Membership.GetUser().UserName==e.Author) { %> <%= Html.ActionLink("Editer","Edit", new { id = e.Id }, new { @class="actionlink" }) %> <%= Html.ActionLink("Supprimer","RemovePost", new { id = e.Id }, new { @class="actionlink" } ) %> diff --git a/web/Views/Web.config b/web/Views/Web.config index 787c29ba..0c940597 100644 --- a/web/Views/Web.config +++ b/web/Views/Web.config @@ -1,4 +1,4 @@ - + diff --git a/web/Web.csproj b/web/Web.csproj index 561118f9..a77388fc 100644 --- a/web/Web.csproj +++ b/web/Web.csproj @@ -78,9 +78,6 @@ ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - - ..\packages\MarkdownDeep.NET.1.5\lib\.NetFramework 3.5\MarkdownDeep.dll - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll @@ -105,6 +102,9 @@ ..\packages\PayPalCoreSDK.1.6.2\lib\net451\PayPalCoreSDK.dll + + lib\MarkdownDeep.dll + @@ -139,6 +139,8 @@ + + @@ -297,12 +299,8 @@ - - - - @@ -333,7 +331,6 @@ - @@ -372,6 +369,15 @@ + + + + + + + + + @@ -398,8 +404,8 @@ MSDiscoCodeGenerator Reference.cs - - + + diff --git a/web/fonts/FontAwesome.otf b/web/fonts/FontAwesome.otf new file mode 100644 index 00000000..81c9ad94 Binary files /dev/null and b/web/fonts/FontAwesome.otf differ diff --git a/web/fonts/fontawesome-webfont.eot b/web/fonts/fontawesome-webfont.eot new file mode 100644 index 00000000..84677bc0 Binary files /dev/null and b/web/fonts/fontawesome-webfont.eot differ diff --git a/web/fonts/fontawesome-webfont.svg b/web/fonts/fontawesome-webfont.svg new file mode 100644 index 00000000..d907b25a --- /dev/null +++ b/web/fonts/fontawesome-webfont.svg @@ -0,0 +1,520 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/fonts/fontawesome-webfont.ttf b/web/fonts/fontawesome-webfont.ttf new file mode 100644 index 00000000..96a3639c Binary files /dev/null and b/web/fonts/fontawesome-webfont.ttf differ diff --git a/web/fonts/fontawesome-webfont.woff b/web/fonts/fontawesome-webfont.woff new file mode 100644 index 00000000..628b6a52 Binary files /dev/null and b/web/fonts/fontawesome-webfont.woff differ diff --git a/web/lib/MarkdownDeep.dll b/web/lib/MarkdownDeep.dll new file mode 100755 index 00000000..70e440b6 Binary files /dev/null and b/web/lib/MarkdownDeep.dll differ diff --git a/web/packages.config b/web/packages.config index 1ad4d6fa..76c1f0a7 100644 --- a/web/packages.config +++ b/web/packages.config @@ -6,9 +6,6 @@ - - - diff --git a/yavscModel/Blogs/BlogEntry.cs b/yavscModel/Blogs/BlogEntry.cs index c732dc8d..e0127139 100644 --- a/yavscModel/Blogs/BlogEntry.cs +++ b/yavscModel/Blogs/BlogEntry.cs @@ -71,8 +71,8 @@ namespace Yavsc.Model.Blogs /// /// The name of the user. [StringLength(255)] - [DisplayName("Nom de l'auteur")] - public string UserName { + [DisplayName("Auteur")] + public string Author { get { return userName; } diff --git a/yavscModel/Blogs/BlogEntryCollection.cs b/yavscModel/Blogs/BlogEntryCollection.cs index 80a9876d..5d6fc5b3 100644 --- a/yavscModel/Blogs/BlogEntryCollection.cs +++ b/yavscModel/Blogs/BlogEntryCollection.cs @@ -64,7 +64,7 @@ namespace Yavsc.Model.Blogs /// /// The name of the user. /// - public string UserName; + public string Author; /// /// The identifier. /// @@ -111,7 +111,7 @@ namespace Yavsc.Model.Blogs return from be in this orderby be.Posted descending group - new PostInfoByTitle { UserName=be.UserName, Id=be.Id, + new PostInfoByTitle { Author=be.Author, Id=be.Id, Posted=be.Posted, Modified=be.Modified } by be.Title into titlegroup @@ -128,7 +128,7 @@ namespace Yavsc.Model.Blogs group new PostInfoByUser { Title=be.Title, Id=be.Id, Posted=be.Posted, Modified=be.Modified } - by be.UserName + by be.Author into usergroup select usergroup; } diff --git a/yavscModel/Blogs/BlogManager.cs b/yavscModel/Blogs/BlogManager.cs index aae0bd48..3f757d63 100644 --- a/yavscModel/Blogs/BlogManager.cs +++ b/yavscModel/Blogs/BlogManager.cs @@ -192,7 +192,7 @@ namespace Yavsc.Model.Blogs throw new PostNotFoundException (); if (!Roles.IsUserInRole ("Admin")) { string rguser = Membership.GetUser ().UserName; - if (rguser != e.UserName) { + if (rguser != e.Author) { if (throwEx) throw new AccessViolationException ( string.Format ( @@ -212,7 +212,7 @@ namespace Yavsc.Model.Blogs // only deliver to admins, owner, or specified circle memebers if (u == null) return false; - if (u.UserName != e.UserName) + if (u.UserName != e.Author) if (!Roles.IsUserInRole (u.UserName, "Admin")) { if (!e.Visible) diff --git a/yavscModel/Blogs/UUBlogEntryCollection.cs b/yavscModel/Blogs/UUBlogEntryCollection.cs index f44c7ba2..d7e85dfe 100644 --- a/yavscModel/Blogs/UUBlogEntryCollection.cs +++ b/yavscModel/Blogs/UUBlogEntryCollection.cs @@ -43,14 +43,14 @@ namespace Yavsc.Model.Blogs /// Gets the name of the user. /// /// The name of the user. - public string UserName { get { return _username; } } + public string Author { get { return _username; } } /// /// Returns a that represents the current . /// /// A that represents the current . public override string ToString () { - return string.Format ("[UUBlogEntryCollection: UserName={0} Count={1}]", UserName, Count); + return string.Format ("[UUBlogEntryCollection: Author={0} Count={1}]", Author, Count); } } diff --git a/yavscModel/Blogs/UUTBlogEntryCollection.cs b/yavscModel/Blogs/UUTBlogEntryCollection.cs index b35c2ca6..c11758af 100644 --- a/yavscModel/Blogs/UUTBlogEntryCollection.cs +++ b/yavscModel/Blogs/UUTBlogEntryCollection.cs @@ -51,7 +51,7 @@ namespace Yavsc.Model.Blogs public override string ToString () { return string.Format ("[UUTBlogEntryCollection: " + - "Title={0} User={1} Count={2}]", Title, UserName, Count); + "Title={0} User={1} Count={2}]", Title, Author, Count); } diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog index 497dd763..c239d3ed 100644 --- a/yavscModel/ChangeLog +++ b/yavscModel/ChangeLog @@ -1,3 +1,11 @@ +2015-09-23 Paul Schneider + + * BlogEntry.cs: + * BlogManager.cs: + * BlogEntryCollection.cs: + * UUBlogEntryCollection.cs: + * UUTBlogEntryCollection.cs: refactoring + 2015-09-16 Paul Schneider * LocalizedText.resx: