diff --git a/src/Umbraco.Web.UI.Client/lib/jquery/jquery.upload/js/load-image.min.js b/src/Umbraco.Web.UI.Client/lib/jquery/jquery.upload/js/load-image.min.js new file mode 100644 index 0000000000..8f04e85144 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/lib/jquery/jquery.upload/js/load-image.min.js @@ -0,0 +1 @@ +(function(e){"use strict";var t=function(e,i,a){var n,r,o=document.createElement("img");if(o.onerror=i,o.onload=function(){!r||a&&a.noRevoke||t.revokeObjectURL(r),i&&i(t.scale(o,a))},t.isInstanceOf("Blob",e)||t.isInstanceOf("File",e))n=r=t.createObjectURL(e),o._type=e.type;else{if("string"!=typeof e)return!1;n=e,a&&a.crossOrigin&&(o.crossOrigin=a.crossOrigin)}return n?(o.src=n,o):t.readFile(e,function(e){var t=e.target;t&&t.result?o.src=t.result:i&&i(e)})},i=window.createObjectURL&&window||window.URL&&URL.revokeObjectURL&&URL||window.webkitURL&&webkitURL;t.isInstanceOf=function(e,t){return Object.prototype.toString.call(t)==="[object "+e+"]"},t.transformCoordinates=function(){},t.getTransformedOptions=function(e){return e},t.renderImageToCanvas=function(e,t,i,a,n,r,o,s,d,l){return e.getContext("2d").drawImage(t,i,a,n,r,o,s,d,l),e},t.hasCanvasOption=function(e){return e.canvas||e.crop},t.scale=function(e,i){i=i||{};var a,n,r,o,s,d,l,c,u,g=document.createElement("canvas"),f=e.getContext||t.hasCanvasOption(i)&&g.getContext,h=e.naturalWidth||e.width,m=e.naturalHeight||e.height,p=h,S=m,b=function(){var e=Math.max((r||p)/p,(o||S)/S);e>1&&(p=Math.ceil(p*e),S=Math.ceil(S*e))},v=function(){var e=Math.min((a||p)/p,(n||S)/S);1>e&&(p=Math.ceil(p*e),S=Math.ceil(S*e))};return f&&(i=t.getTransformedOptions(i),l=i.left||0,c=i.top||0,i.sourceWidth?(s=i.sourceWidth,void 0!==i.right&&void 0===i.left&&(l=h-s-i.right)):s=h-l-(i.right||0),i.sourceHeight?(d=i.sourceHeight,void 0!==i.bottom&&void 0===i.top&&(c=m-d-i.bottom)):d=m-c-(i.bottom||0),p=s,S=d),a=i.maxWidth,n=i.maxHeight,r=i.minWidth,o=i.minHeight,f&&a&&n&&i.crop?(p=a,S=n,u=s/d-a/n,0>u?(d=n*s/a,void 0===i.top&&void 0===i.bottom&&(c=(m-d)/2)):u>0&&(s=a*d/n,void 0===i.left&&void 0===i.right&&(l=(h-s)/2))):((i.contain||i.cover)&&(r=a=a||r,o=n=n||o),i.cover?(v(),b()):(b(),v())),f?(g.width=p,g.height=S,t.transformCoordinates(g,i),t.renderImageToCanvas(g,e,l,c,s,d,0,0,p,S)):(e.width=p,e.height=S,e)},t.createObjectURL=function(e){return i?i.createObjectURL(e):!1},t.revokeObjectURL=function(e){return i?i.revokeObjectURL(e):!1},t.readFile=function(e,t,i){if(window.FileReader){var a=new FileReader;if(a.onload=a.onerror=t,i=i||"readAsDataURL",a[i])return a[i](e),a}return!1},"function"==typeof define&&define.amd?define(function(){return t}):e.loadImage=t})(this),function(e){"use strict";"function"==typeof define&&define.amd?define(["load-image"],e):e(window.loadImage)}(function(e){"use strict";if(window.navigator&&window.navigator.platform&&/iP(hone|od|ad)/.test(window.navigator.platform)){var t=e.renderImageToCanvas;e.detectSubsampling=function(e){var t,i;return e.width*e.height>1048576?(t=document.createElement("canvas"),t.width=t.height=1,i=t.getContext("2d"),i.drawImage(e,-e.width+1,0),0===i.getImageData(0,0,1,1).data[3]):!1},e.detectVerticalSquash=function(e,t){var i,a,n,r,o,s=e.naturalHeight||e.height,d=document.createElement("canvas"),l=d.getContext("2d");for(t&&(s/=2),d.width=1,d.height=s,l.drawImage(e,0,0),i=l.getImageData(0,0,1,s).data,a=0,n=s,r=s;r>a;)o=i[4*(r-1)+3],0===o?n=r:a=r,r=n+a>>1;return r/s||1},e.renderImageToCanvas=function(i,a,n,r,o,s,d,l,c,u){if("image/jpeg"===a._type){var g,f,h,m,p=i.getContext("2d"),S=document.createElement("canvas"),b=1024,v=S.getContext("2d");if(S.width=b,S.height=b,p.save(),g=e.detectSubsampling(a),g&&(n/=2,r/=2,o/=2,s/=2),f=e.detectVerticalSquash(a,g),g||1!==f){for(r*=f,c=Math.ceil(b*c/o),u=Math.ceil(b*u/s/f),l=0,m=0;s>m;){for(d=0,h=0;o>h;)v.clearRect(0,0,b,b),v.drawImage(a,n,r,o,s,-h,-m,o,s),p.drawImage(S,0,0,b,b,d,l,c,u),h+=b,d+=c;m+=b,l+=u}return p.restore(),i}}return t(i,a,n,r,o,s,d,l,c,u)}}}),function(e){"use strict";"function"==typeof define&&define.amd?define(["load-image"],e):e(window.loadImage)}(function(e){"use strict";var t=e.hasCanvasOption;e.hasCanvasOption=function(e){return t(e)||e.orientation},e.transformCoordinates=function(e,t){var i=e.getContext("2d"),a=e.width,n=e.height,r=t.orientation;if(r)switch(r>4&&(e.width=n,e.height=a),r){case 2:i.translate(a,0),i.scale(-1,1);break;case 3:i.translate(a,n),i.rotate(Math.PI);break;case 4:i.translate(0,n),i.scale(1,-1);break;case 5:i.rotate(.5*Math.PI),i.scale(1,-1);break;case 6:i.rotate(.5*Math.PI),i.translate(0,-n);break;case 7:i.rotate(.5*Math.PI),i.translate(a,-n),i.scale(-1,1);break;case 8:i.rotate(-.5*Math.PI),i.translate(-a,0)}},e.getTransformedOptions=function(e){if(!e.orientation||1===e.orientation)return e;var t,i={};for(t in e)e.hasOwnProperty(t)&&(i[t]=e[t]);switch(e.orientation){case 2:i.left=e.right,i.right=e.left;break;case 3:i.left=e.right,i.top=e.bottom,i.right=e.left,i.bottom=e.top;break;case 4:i.top=e.bottom,i.bottom=e.top;break;case 5:i.left=e.top,i.top=e.left,i.right=e.bottom,i.bottom=e.right;break;case 6:i.left=e.top,i.top=e.right,i.right=e.bottom,i.bottom=e.left;break;case 7:i.left=e.bottom,i.top=e.right,i.right=e.top,i.bottom=e.left;break;case 8:i.left=e.bottom,i.top=e.left,i.right=e.top,i.bottom=e.right}return e.orientation>4&&(i.maxWidth=e.maxHeight,i.maxHeight=e.maxWidth,i.minWidth=e.minHeight,i.minHeight=e.minWidth,i.sourceWidth=e.sourceHeight,i.sourceHeight=e.sourceWidth),i}}),function(e){"use strict";"function"==typeof define&&define.amd?define(["load-image"],e):e(window.loadImage)}(function(e){"use strict";var t=window.Blob&&(Blob.prototype.slice||Blob.prototype.webkitSlice||Blob.prototype.mozSlice);e.blobSlice=t&&function(){var e=this.slice||this.webkitSlice||this.mozSlice;return e.apply(this,arguments)},e.metaDataParsers={jpeg:{65505:[]}},e.parseMetaData=function(t,i,a){a=a||{};var n=this,r=a.maxMetaDataSize||262144,o={},s=!(window.DataView&&t&&t.size>=12&&"image/jpeg"===t.type&&e.blobSlice);(s||!e.readFile(e.blobSlice.call(t,0,r),function(t){var r,s,d,l,c=t.target.result,u=new DataView(c),g=2,f=u.byteLength-4,h=g;if(65496===u.getUint16(0)){for(;f>g&&(r=u.getUint16(g),r>=65504&&65519>=r||65534===r);){if(s=u.getUint16(g+2)+2,g+s>u.byteLength){console.log("Invalid meta data: Invalid segment size.");break}if(d=e.metaDataParsers.jpeg[r])for(l=0;d.length>l;l+=1)d[l].call(n,u,g,s,o,a);g+=s,h=g}!a.disableImageHead&&h>6&&(o.imageHead=c.slice?c.slice(0,h):new Uint8Array(c).subarray(0,h))}else console.log("Invalid JPEG file: Missing JPEG marker.");i(o)},"readAsArrayBuffer"))&&i(o)}}),function(e){"use strict";"function"==typeof define&&define.amd?define(["load-image","load-image-meta"],e):e(window.loadImage)}(function(e){"use strict";e.ExifMap=function(){return this},e.ExifMap.prototype.map={Orientation:274},e.ExifMap.prototype.get=function(e){return this[e]||this[this.map[e]]},e.getExifThumbnail=function(e,t,i){var a,n,r;if(!i||t+i>e.byteLength)return console.log("Invalid Exif data: Invalid thumbnail data."),void 0;for(a=[],n=0;i>n;n+=1)r=e.getUint8(t+n),a.push((16>r?"0":"")+r.toString(16));return"data:image/jpeg,%"+a.join("%")},e.exifTagTypes={1:{getValue:function(e,t){return e.getUint8(t)},size:1},2:{getValue:function(e,t){return String.fromCharCode(e.getUint8(t))},size:1,ascii:!0},3:{getValue:function(e,t,i){return e.getUint16(t,i)},size:2},4:{getValue:function(e,t,i){return e.getUint32(t,i)},size:4},5:{getValue:function(e,t,i){return e.getUint32(t,i)/e.getUint32(t+4,i)},size:8},9:{getValue:function(e,t,i){return e.getInt32(t,i)},size:4},10:{getValue:function(e,t,i){return e.getInt32(t,i)/e.getInt32(t+4,i)},size:8}},e.exifTagTypes[7]=e.exifTagTypes[1],e.getExifValue=function(t,i,a,n,r,o){var s,d,l,c,u,g,f=e.exifTagTypes[n];if(!f)return console.log("Invalid Exif data: Invalid tag type."),void 0;if(s=f.size*r,d=s>4?i+t.getUint32(a+8,o):a+8,d+s>t.byteLength)return console.log("Invalid Exif data: Invalid data offset."),void 0;if(1===r)return f.getValue(t,d,o);for(l=[],c=0;r>c;c+=1)l[c]=f.getValue(t,d+c*f.size,o);if(f.ascii){for(u="",c=0;l.length>c&&(g=l[c],"\0"!==g);c+=1)u+=g;return u}return l},e.parseExifTag=function(t,i,a,n,r){var o=t.getUint16(a,n);r.exif[o]=e.getExifValue(t,i,a,t.getUint16(a+2,n),t.getUint32(a+4,n),n)},e.parseExifTags=function(e,t,i,a,n){var r,o,s;if(i+6>e.byteLength)return console.log("Invalid Exif data: Invalid directory offset."),void 0;if(r=e.getUint16(i,a),o=i+2+12*r,o+4>e.byteLength)return console.log("Invalid Exif data: Invalid directory size."),void 0;for(s=0;r>s;s+=1)this.parseExifTag(e,t,i+2+12*s,a,n);return e.getUint32(o,a)},e.parseExifData=function(t,i,a,n,r){if(!r.disableExif){var o,s,d,l=i+10;if(1165519206===t.getUint32(i+4)){if(l+8>t.byteLength)return console.log("Invalid Exif data: Invalid segment size."),void 0;if(0!==t.getUint16(i+8))return console.log("Invalid Exif data: Missing byte alignment offset."),void 0;switch(t.getUint16(l)){case 18761:o=!0;break;case 19789:o=!1;break;default:return console.log("Invalid Exif data: Invalid byte alignment marker."),void 0}if(42!==t.getUint16(l+2,o))return console.log("Invalid Exif data: Missing TIFF marker."),void 0;s=t.getUint32(l+4,o),n.exif=new e.ExifMap,s=e.parseExifTags(t,l,l+s,o,n),s&&!r.disableExifThumbnail&&(d={exif:{}},s=e.parseExifTags(t,l,l+s,o,d),d.exif[513]&&(n.exif.Thumbnail=e.getExifThumbnail(t,l+d.exif[513],d.exif[514]))),n.exif[34665]&&!r.disableExifSub&&e.parseExifTags(t,l,l+n.exif[34665],o,n),n.exif[34853]&&!r.disableExifGps&&e.parseExifTags(t,l,l+n.exif[34853],o,n)}}},e.metaDataParsers.jpeg[65505].push(e.parseExifData)}),function(e){"use strict";"function"==typeof define&&define.amd?define(["load-image","load-image-exif"],e):e(window.loadImage)}(function(e){"use strict";var t,i,a;e.ExifMap.prototype.tags={256:"ImageWidth",257:"ImageHeight",34665:"ExifIFDPointer",34853:"GPSInfoIFDPointer",40965:"InteroperabilityIFDPointer",258:"BitsPerSample",259:"Compression",262:"PhotometricInterpretation",274:"Orientation",277:"SamplesPerPixel",284:"PlanarConfiguration",530:"YCbCrSubSampling",531:"YCbCrPositioning",282:"XResolution",283:"YResolution",296:"ResolutionUnit",273:"StripOffsets",278:"RowsPerStrip",279:"StripByteCounts",513:"JPEGInterchangeFormat",514:"JPEGInterchangeFormatLength",301:"TransferFunction",318:"WhitePoint",319:"PrimaryChromaticities",529:"YCbCrCoefficients",532:"ReferenceBlackWhite",306:"DateTime",270:"ImageDescription",271:"Make",272:"Model",305:"Software",315:"Artist",33432:"Copyright",36864:"ExifVersion",40960:"FlashpixVersion",40961:"ColorSpace",40962:"PixelXDimension",40963:"PixelYDimension",42240:"Gamma",37121:"ComponentsConfiguration",37122:"CompressedBitsPerPixel",37500:"MakerNote",37510:"UserComment",40964:"RelatedSoundFile",36867:"DateTimeOriginal",36868:"DateTimeDigitized",37520:"SubSecTime",37521:"SubSecTimeOriginal",37522:"SubSecTimeDigitized",33434:"ExposureTime",33437:"FNumber",34850:"ExposureProgram",34852:"SpectralSensitivity",34855:"PhotographicSensitivity",34856:"OECF",34864:"SensitivityType",34865:"StandardOutputSensitivity",34866:"RecommendedExposureIndex",34867:"ISOSpeed",34868:"ISOSpeedLatitudeyyy",34869:"ISOSpeedLatitudezzz",37377:"ShutterSpeedValue",37378:"ApertureValue",37379:"BrightnessValue",37380:"ExposureBias",37381:"MaxApertureValue",37382:"SubjectDistance",37383:"MeteringMode",37384:"LightSource",37385:"Flash",37396:"SubjectArea",37386:"FocalLength",41483:"FlashEnergy",41484:"SpatialFrequencyResponse",41486:"FocalPlaneXResolution",41487:"FocalPlaneYResolution",41488:"FocalPlaneResolutionUnit",41492:"SubjectLocation",41493:"ExposureIndex",41495:"SensingMethod",41728:"FileSource",41729:"SceneType",41730:"CFAPattern",41985:"CustomRendered",41986:"ExposureMode",41987:"WhiteBalance",41988:"DigitalZoomRatio",41989:"FocalLengthIn35mmFilm",41990:"SceneCaptureType",41991:"GainControl",41992:"Contrast",41993:"Saturation",41994:"Sharpness",41995:"DeviceSettingDescription",41996:"SubjectDistanceRange",42016:"ImageUniqueID",42032:"CameraOwnerName",42033:"BodySerialNumber",42034:"LensSpecification",42035:"LensMake",42036:"LensModel",42037:"LensSerialNumber",0:"GPSVersionID",1:"GPSLatitudeRef",2:"GPSLatitude",3:"GPSLongitudeRef",4:"GPSLongitude",5:"GPSAltitudeRef",6:"GPSAltitude",7:"GPSTimeStamp",8:"GPSSatellites",9:"GPSStatus",10:"GPSMeasureMode",11:"GPSDOP",12:"GPSSpeedRef",13:"GPSSpeed",14:"GPSTrackRef",15:"GPSTrack",16:"GPSImgDirectionRef",17:"GPSImgDirection",18:"GPSMapDatum",19:"GPSDestLatitudeRef",20:"GPSDestLatitude",21:"GPSDestLongitudeRef",22:"GPSDestLongitude",23:"GPSDestBearingRef",24:"GPSDestBearing",25:"GPSDestDistanceRef",26:"GPSDestDistance",27:"GPSProcessingMethod",28:"GPSAreaInformation",29:"GPSDateStamp",30:"GPSDifferential",31:"GPSHPositioningError"},e.ExifMap.prototype.stringValues={ExposureProgram:{0:"Undefined",1:"Manual",2:"Normal program",3:"Aperture priority",4:"Shutter priority",5:"Creative program",6:"Action program",7:"Portrait mode",8:"Landscape mode"},MeteringMode:{0:"Unknown",1:"Average",2:"CenterWeightedAverage",3:"Spot",4:"MultiSpot",5:"Pattern",6:"Partial",255:"Other"},LightSource:{0:"Unknown",1:"Daylight",2:"Fluorescent",3:"Tungsten (incandescent light)",4:"Flash",9:"Fine weather",10:"Cloudy weather",11:"Shade",12:"Daylight fluorescent (D 5700 - 7100K)",13:"Day white fluorescent (N 4600 - 5400K)",14:"Cool white fluorescent (W 3900 - 4500K)",15:"White fluorescent (WW 3200 - 3700K)",17:"Standard light A",18:"Standard light B",19:"Standard light C",20:"D55",21:"D65",22:"D75",23:"D50",24:"ISO studio tungsten",255:"Other"},Flash:{0:"Flash did not fire",1:"Flash fired",5:"Strobe return light not detected",7:"Strobe return light detected",9:"Flash fired, compulsory flash mode",13:"Flash fired, compulsory flash mode, return light not detected",15:"Flash fired, compulsory flash mode, return light detected",16:"Flash did not fire, compulsory flash mode",24:"Flash did not fire, auto mode",25:"Flash fired, auto mode",29:"Flash fired, auto mode, return light not detected",31:"Flash fired, auto mode, return light detected",32:"No flash function",65:"Flash fired, red-eye reduction mode",69:"Flash fired, red-eye reduction mode, return light not detected",71:"Flash fired, red-eye reduction mode, return light detected",73:"Flash fired, compulsory flash mode, red-eye reduction mode",77:"Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected",79:"Flash fired, compulsory flash mode, red-eye reduction mode, return light detected",89:"Flash fired, auto mode, red-eye reduction mode",93:"Flash fired, auto mode, return light not detected, red-eye reduction mode",95:"Flash fired, auto mode, return light detected, red-eye reduction mode"},SensingMethod:{1:"Undefined",2:"One-chip color area sensor",3:"Two-chip color area sensor",4:"Three-chip color area sensor",5:"Color sequential area sensor",7:"Trilinear sensor",8:"Color sequential linear sensor"},SceneCaptureType:{0:"Standard",1:"Landscape",2:"Portrait",3:"Night scene"},SceneType:{1:"Directly photographed"},CustomRendered:{0:"Normal process",1:"Custom process"},WhiteBalance:{0:"Auto white balance",1:"Manual white balance"},GainControl:{0:"None",1:"Low gain up",2:"High gain up",3:"Low gain down",4:"High gain down"},Contrast:{0:"Normal",1:"Soft",2:"Hard"},Saturation:{0:"Normal",1:"Low saturation",2:"High saturation"},Sharpness:{0:"Normal",1:"Soft",2:"Hard"},SubjectDistanceRange:{0:"Unknown",1:"Macro",2:"Close view",3:"Distant view"},FileSource:{3:"DSC"},ComponentsConfiguration:{0:"",1:"Y",2:"Cb",3:"Cr",4:"R",5:"G",6:"B"},Orientation:{1:"top-left",2:"top-right",3:"bottom-right",4:"bottom-left",5:"left-top",6:"right-top",7:"right-bottom",8:"left-bottom"}},e.ExifMap.prototype.getText=function(e){var t=this.get(e);switch(e){case"LightSource":case"Flash":case"MeteringMode":case"ExposureProgram":case"SensingMethod":case"SceneCaptureType":case"SceneType":case"CustomRendered":case"WhiteBalance":case"GainControl":case"Contrast":case"Saturation":case"Sharpness":case"SubjectDistanceRange":case"FileSource":case"Orientation":return this.stringValues[e][t];case"ExifVersion":case"FlashpixVersion":return String.fromCharCode(t[0],t[1],t[2],t[3]);case"ComponentsConfiguration":return this.stringValues[e][t[0]]+this.stringValues[e][t[1]]+this.stringValues[e][t[2]]+this.stringValues[e][t[3]];case"GPSVersionID":return t[0]+"."+t[1]+"."+t[2]+"."+t[3]}return t+""},t=e.ExifMap.prototype.tags,i=e.ExifMap.prototype.map;for(a in t)t.hasOwnProperty(a)&&(i[t[a]]=a);e.ExifMap.prototype.getAll=function(){var e,i,a={};for(e in this)this.hasOwnProperty(e)&&(i=t[e],i&&(a[i]=this.getText(i)));return a}}); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Bold.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Bold.ttf deleted file mode 100755 index fd79d43bea..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Bold.ttf and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-BoldItalic.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-BoldItalic.ttf deleted file mode 100755 index 9bc800958a..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-BoldItalic.ttf and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-ExtraBold.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-ExtraBold.ttf deleted file mode 100755 index 21f6f84a07..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-ExtraBold.ttf and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-ExtraBoldItalic.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-ExtraBoldItalic.ttf deleted file mode 100755 index 31cb688340..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-ExtraBoldItalic.ttf and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Italic.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Italic.ttf deleted file mode 100755 index c90da48ff3..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Italic.ttf and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Light.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Light.ttf deleted file mode 100755 index 0d381897da..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Light.ttf and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-LightItalic.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-LightItalic.ttf deleted file mode 100755 index 68299c4bc6..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-LightItalic.ttf and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.ttf deleted file mode 100755 index db433349b7..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.ttf and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.woff b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.woff deleted file mode 100644 index 58e6cb3818..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Regular.woff and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold.ttf deleted file mode 100755 index 1a7679e394..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-Semibold.ttf and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-SemiboldItalic.ttf b/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-SemiboldItalic.ttf deleted file mode 100755 index 59b6d16b06..0000000000 Binary files a/src/Umbraco.Web.UI.Client/src/assets/fonts/opensans/OpenSans-SemiboldItalic.ttf and /dev/null differ diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbsort.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbsort.directive.js index d1b9a81495..73bfc5bd3b 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbsort.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/editors/umbsort.directive.js @@ -33,13 +33,14 @@ angular.module("umbraco.directives") scope.opts.nested= cfg.nested || true, scope.opts.drop= cfg.drop || true, scope.opts.drag= cfg.drag || true, + /* scope.opts.isValidTarget = function(item, container) { if(container.el.is(".umb-" + scope.opts.group + "-container")){ return true; } return false; }; - + */ element.addClass("umb-sort"); element.addClass("umb-" + cfg.group + "-container"); @@ -53,47 +54,66 @@ angular.module("umbraco.directives") scope.opts.onDrop = function (item, targetContainer, _super) { - var children = $("li", targetContainer.el); - var targetScope = $(targetContainer.el[0]).scope(); - var targetIndex = children.index(item); - - if(targetScope.opts.onDropHandler){ - var args = { - sourceScope: umbSortContextInternal.sourceScope, - sourceIndex: umbSortContextInternal.sourceIndex, - sourceContainer: umbSortContextInternal.sourceContainer, - - targetScope: targetScope, - targetIndex: targetIndex, - targetContainer: targetContainer - }; - - targetScope.opts.onDropHandler.call(this, item, args); - } - - if(umbSortContextInternal.sourceScope.opts.onReleaseHandler){ - var _args = { - sourceScope: umbSortContextInternal.sourceScope, - sourceIndex: umbSortContextInternal.sourceIndex, - sourceContainer: umbSortContextInternal.sourceContainer, - - targetScope: targetScope, - targetIndex: targetIndex, - targetContainer: targetContainer - }; - - umbSortContextInternal.sourceScope.opts.onReleaseHandler.call(this, item, _args); - } - var clonedItem = $('
  • ').css({height: 0}); - item.before(clonedItem); + item.after(clonedItem); clonedItem.animate({'height': item.height()}); + item.animate(clonedItem.position(), function () { + clonedItem.detach(); + _super(item); + }); + + + var children = $("li", targetContainer.el); + var targetIndex = children.index(item); + var targetScope = $(targetContainer.el[0]).scope(); + + + if(targetScope === umbSortContextInternal.sourceScope){ + if(umbSortContextInternal.sourceScope.opts.onSortHandler){ + var _largs = { + oldIndex: umbSortContextInternal.sourceIndex, + newIndex: targetIndex, + scope: umbSortContextInternal.sourceScope + }; + + umbSortContextInternal.sourceScope.opts.onSortHandler.call(this, item, _largs); + } + }else{ + + + if(targetScope.opts.onDropHandler){ + var args = { + sourceScope: umbSortContextInternal.sourceScope, + sourceIndex: umbSortContextInternal.sourceIndex, + sourceContainer: umbSortContextInternal.sourceContainer, + + targetScope: targetScope, + targetIndex: targetIndex, + targetContainer: targetContainer + }; + + targetScope.opts.onDropHandler.call(this, item, args); + } + + if(umbSortContextInternal.sourceScope.opts.onReleaseHandler){ + var _args = { + sourceScope: umbSortContextInternal.sourceScope, + sourceIndex: umbSortContextInternal.sourceIndex, + sourceContainer: umbSortContextInternal.sourceContainer, + + targetScope: targetScope, + targetIndex: targetIndex, + targetContainer: targetContainer + }; + + umbSortContextInternal.sourceScope.opts.onReleaseHandler.call(this, item, _args); + } + } + + + - item.animate(clonedItem.position(), function () { - clonedItem.detach(); - _super(item); - }); }; scope.changeIndex = function(from, to){ diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/section.resource.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/section.resource.js index 15c0a7535a..158d56f44d 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/section.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/section.resource.js @@ -18,6 +18,8 @@ function sectionMocks($httpBackend, mocksUtils) { { name: "Media", cssclass: "icon-umb-media", alias: "media" }, { name: "Settings", cssclass: "icon-umb-settings", alias: "settings" }, { name: "Developer", cssclass: "icon-umb-developer", alias: "developer" }, + { name: "Users", cssclass: "icon-umb-users", alias: "users" }, + { name: "Developer", cssclass: "icon-umb-developer", alias: "developer" }, { name: "Users", cssclass: "icon-umb-users", alias: "users" } ]; diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js index 0362012189..fc138fe28c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js @@ -122,7 +122,7 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) { "mediaApiBaseUrl", "GetByIds", idQuery)), - 'Failed to retreive data for media id ' + id); + 'Failed to retreive data for media ids ' + ids); }, /** diff --git a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js index 5c370fcde1..198022dbfe 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/dialog.service.js @@ -64,8 +64,7 @@ angular.module('umbraco.services') var dialog = angular.extend(defaults, options); var scope = options.scope || $rootScope.$new(); - delete dialog.scope; - + //Modal dom obj and unique id dialog.element = $('
    '); var id = dialog.template.replace('.html', '').replace('.aspx', '').replace(/[\/|\.|:\&\?\=]/g, "-") + '-' + scope.$id; @@ -78,6 +77,7 @@ angular.module('umbraco.services') dialog.element.addClass("modal"); dialog.element.addClass("hide"); } + //set the id and add classes dialog.element .attr('id', id) @@ -332,8 +332,9 @@ angular.module('umbraco.services') * @returns {Object} modal object */ macroPicker: function (options) { - options.template = 'views/common/dialogs/macroPicker.html'; + options.template = 'views/common/dialogs/insertmacro.html'; options.show = true; + options.modalClass = "span7 umb-modal"; return openDialog(options); }, diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index 479e912460..5866b62fb9 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -310,9 +310,7 @@ function tinyMceService(dialogService, $log, imageHelper, assetsService, $timeou /** The insert macro button click event handler */ onclick: function () { - dialogService.open({ - show: true, - template: "views/common/dialogs/insertmacro.html", + dialogService.macroPicker({ scope: $scope, callback: function(data) { diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index 7a5145dea1..8eddaabc32 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -8,6 +8,7 @@ */ // Core variables and mixins +@import "fonts.less"; // Loading fonts @import "variables.less"; // Modify this for custom colors, font-sizes, etc @import "mixins.less"; @@ -23,7 +24,7 @@ @import "../../lib/bootstrap/less/type.less"; @import "../../lib/bootstrap/less/code.less"; @import "tables.less"; -@import "colors.less"; + // Components: common //@import "../../lib/bootstrap/less/sprites.less"; @@ -82,4 +83,4 @@ //used for property editors @import "property-editors.less"; -@import "hacks.less"; // Remove and rewrite before release +@import "hacks.less"; diff --git a/src/Umbraco.Web.UI.Client/src/less/colors.less b/src/Umbraco.Web.UI.Client/src/less/colors.less deleted file mode 100644 index 0b2d107c8f..0000000000 --- a/src/Umbraco.Web.UI.Client/src/less/colors.less +++ /dev/null @@ -1 +0,0 @@ -i.red{color: #b94a48;} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/less/fonts.less b/src/Umbraco.Web.UI.Client/src/less/fonts.less new file mode 100644 index 0000000000..c27ae9f1ef --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/fonts.less @@ -0,0 +1,9 @@ +/* + Open Sans + + Normal: font-weight: 400; + Semi-bold: font-weight: 600; + +*/ + +@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less index fc4d49b75c..e29b0e22af 100644 --- a/src/Umbraco.Web.UI.Client/src/less/forms.less +++ b/src/Umbraco.Web.UI.Client/src/less/forms.less @@ -24,6 +24,12 @@ label.control-label { .controls-row label{padding: 0px 10px 0px 10px; vertical-align: center} + + +//standard editor width +.umb-editor{width: 460px;} + + //utill styll to hide child untill hover .hover-show{visibility: hidden;} *:hover > .hover-show{visibility: visible;} diff --git a/src/Umbraco.Web.UI.Client/src/less/hacks.less b/src/Umbraco.Web.UI.Client/src/less/hacks.less index f850e90319..9cd96ccca4 100644 --- a/src/Umbraco.Web.UI.Client/src/less/hacks.less +++ b/src/Umbraco.Web.UI.Client/src/less/hacks.less @@ -76,6 +76,7 @@ iframe, .content-column-body { background-size: contain; display: none; } + .fileupload-processing .fileupload-loading { display: block; } diff --git a/src/Umbraco.Web.UI.Client/src/less/helveticons.less b/src/Umbraco.Web.UI.Client/src/less/helveticons.less index 7616d357e9..50a54a688a 100644 --- a/src/Umbraco.Web.UI.Client/src/less/helveticons.less +++ b/src/Umbraco.Web.UI.Client/src/less/helveticons.less @@ -163,13 +163,13 @@ i.small{ .icon-umb-deploy:before { content: "\e027"; } -.icon-umb-contour:before, .traycontent:before, { +.icon-umb-contour:before, .traycontour:before, { content: "\e028"; } .icon-umb-settings:before, .traysettings:before, { content: "\e029"; } -.icon-umb-users:before, .trayusers:before, { +.icon-umb-users:before, .trayuser:before, .trayusers:before{ content: "\e02a"; } .icon-umb-media:before, .traymedia:before, { diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less index 22ece1ac8f..fc932805ce 100644 --- a/src/Umbraco.Web.UI.Client/src/less/listview.less +++ b/src/Umbraco.Web.UI.Client/src/less/listview.less @@ -1,6 +1,7 @@ // Listview // ------------------------- +.umb-listview{width: auto !important;} .umb-listview .dropdown-menu { border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less index 222b4493aa..ca00e90d1d 100644 --- a/src/Umbraco.Web.UI.Client/src/less/main.less +++ b/src/Umbraco.Web.UI.Client/src/less/main.less @@ -147,13 +147,17 @@ div.umb-codeeditor .umb-btn-toolbar { } - - /* FORM GRID */ .umb-pane { margin: 30px 20px; } +.umb-control-group { + border-bottom: 1px solid @grayLighter; + padding-bottom: 30px; + margin-bottom: 25px !important; +} + .umb-control-group .umb-el-wrap { padding: 0 } diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less index faab7f1709..2e642457ca 100644 --- a/src/Umbraco.Web.UI.Client/src/less/modals.less +++ b/src/Umbraco.Web.UI.Client/src/less/modals.less @@ -57,7 +57,6 @@ .umb-dialog { outline: none; } - .umb-dialog .umb-btn-toolbar { text-align: right; padding: 15px 20px 10px 20px; @@ -65,13 +64,11 @@ clear: both; border-top: #efefef 1px solid } - .umb-dialog-body{ overflow:auto; } /* modal and umb-modal are used for right.hand dialogs */ - .modal.fade.in{border: none !important; border-radius: none !important;} .umb-modal.fade { outline: none; @@ -84,6 +81,7 @@ transition: opacity 0.3s linear, top 0.3s ease-out; height: 100% !important; } + .umb-modal.fade.in { top: 0 !important; left: 100% !important; diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index 07799ba1cd..6f85daf02b 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -30,9 +30,6 @@ cursor: text; } -.umb-panel-header h1.umb-headline-editor { - cursor: text; -} .umb-headline-editor-wrapper, h1.headline{height: 40px; padding: 30px 0 0 20px;} @@ -55,15 +52,17 @@ h1.headline{height: 40px; padding: 30px 0 0 20px;} } .umb-panel-header h1, { margin: 0; - font-size: @fontSizeLarge; + font-size: @fontSizeMedium; font-weight: 400; color: @gray; - line-height: 22px; + line-height: 1em; width: 100%; + margin: -2px 0 0 0; } .umb-headline-editor-wrapper input{ display: none; + font-size: @fontSizeMedium } .umb-headline-editor-wrapper h1.umb-headline-editor:hover, .umb-headline-editor-wrapper input { @@ -71,9 +70,14 @@ h1.headline{height: 40px; padding: 30px 0 0 20px;} } .umb-headline-editor-wrapper input:focus { - border: 1px solid @grayLight; - background: @white; - width: 100%; + background: none; + border: none; + width: auto; + margin: -9px 0 0 0; + padding: 0 0 2px 0; + border-radius: 0; + line-height: 1em; + color: @black } @@ -95,6 +99,11 @@ h1.headline{height: 40px; padding: 30px 0 0 20px;} .umb-panel-footer { margin: 0; padding: 20px; + z-index: 999; + position: absolute; + bottom: 0px; + left: 0px; + right: 0px; } diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less index e9f7ee87a3..c996a2bdae 100644 --- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less +++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less @@ -1,7 +1,6 @@ // // Color picker // -------------------------------------------------- - ul.color-picker li { padding: 2px; margin: 3px; @@ -21,3 +20,15 @@ ul.color-picker li a { width:30px; border:none; } + +// +// Media picker +// -------------------------------------------------- +.umb-mediapicker .add-link{ + display: inline-block; + height: 100px; + width: 100px; + text-align: center; + border: 1px @grayLight dashed; + line-height: 100px +} diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less index d2be07b7c3..19ce8cb0c3 100644 --- a/src/Umbraco.Web.UI.Client/src/less/sections.less +++ b/src/Umbraco.Web.UI.Client/src/less/sections.less @@ -9,37 +9,52 @@ ul.sections { } ul.sections li { - border-bottom: 1px solid @grayDark; display: block; + border-left: 4px @blackLight solid; + -webkit-transition: all .3s linear; + -moz-transition: all .3s linear; + transition: all .3s linear; } -ul.sections li [class^="icon-"]:before, ul.sections li [class*=" icon-"]:before{ - font-size: 24px; +ul.sections li [class^="icon-"]:before, +ul.sections li [class*=" icon-"]:before{ + font-size: 30px; + margin: 1px 0 0 0; + opacity: 0.4; + -webkit-transition: all .3s linear; + -moz-transition: all .3s linear; + transition: all .3s linear; +} + +ul.sections:hover li [class^="icon-"]:before, +ul.sections:hover li [class*=" icon-"]:before { + opacity: 1 } ul.sections li a { - display: inline-block; + display: block; text-decoration: none; - font-size: 10px; text-align: center; - color: @gray; - -webkit-transition: color .5s linear; - -moz-transition: color .5s linear; - transition: color .5s linear; - - padding-top: 15px; - padding-bottom: 15px; + color: @grayLight; + padding: 20px 4px 4px 0; + border-bottom: 1px solid @grayDark; + width: 100%; + height: 100%; + margin: 0 0 0 -4px; } ul.sections a span { - display: block; font-size: 10px; - line-height: 1em; + line-height: 1.4em; + opacity: 0; + -webkit-transition: all .3s linear; + -moz-transition: all .3s linear; + transition: all .3s linear; + display: block; } - -ul.sections:hover li a { - color: @grayLight; +ul.sections:hover a span { + opacity: 1 } @@ -50,6 +65,8 @@ ul.sections li.avatar { height: 69px; padding: 30px 0 0 0; text-align: center; + margin: 0 0 0 -4px; + border-bottom: 1px solid @grayDark; } ul.sections li.avatar a { @@ -57,6 +74,7 @@ ul.sections li.avatar a { padding: 0; width: 40px; height: 40px; + border: none } ul.sections li.avatar a img { @@ -67,27 +85,20 @@ ul.sections li.avatar a img { opacity: 0.4 } -ul.sections li i { - display: inline-block; -} - -ul.sections li a { - display: inline-block; - padding-left: 4px; - padding-right: 4px; -} - -ul.sections li.current { +ul.sections li.current, ul.sections li:hover { border-left: 4px @orange solid; } +ul.sections li.avatar.current, ul.sections li.avatar:hover { + border-left: 4px @blackLight solid; +} + ul.sections li.current a{ padding-left: 0px; } ul.sections li.help { - border-top: 1px solid @grayDark; - border-bottom: none; + margin: 0; position: absolute; bottom: 0; @@ -95,3 +106,7 @@ ul.sections li.help { display: block; width: 100%; } + +ul.sections li.help a { + border-bottom: none; +} diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index 9738fdea0f..b0635cc55b 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -44,7 +44,7 @@ // Typography // ------------------------- -@sansFontFamily: "Helvetica Neue", "Open Sans", Helvetica, Arial, sans-serif; +@sansFontFamily: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @serifFontFamily: Georgia, "Times New Roman", Times, serif; @monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace; @@ -63,6 +63,7 @@ // Based on 14px font-size and 20px line-height @fontSizeLarge: @baseFontSize * 1.25; // ~18px +@fontSizeMedium: @baseFontSize * 1.15; // ~14px @fontSizeSmall: @baseFontSize * 0.85; // ~12px @fontSizeMini: @baseFontSize * 0.75; // ~11px diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js index e1b44dc5e1..a813f76d67 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js @@ -30,7 +30,7 @@ angular.module("umbraco") if(folderId > 0){ entityResource.getAncestors(folderId, "media") .then(function(anc){ - anc.splice(0,1); + // anc.splice(0,1); $scope.path = anc; }); }else{ @@ -55,19 +55,17 @@ angular.module("umbraco") $scope.gotoFolder($scope.options.formData.currentFolder); }); - $scope.selectMediaItem = function(image) { if (image.contentTypeAlias.toLowerCase() == 'folder') { $scope.options.formData.currentFolder = image.id; $scope.gotoFolder(image.id); - } - else if (image.contentTypeAlias.toLowerCase() == 'image') { + }else if (image.contentTypeAlias.toLowerCase() == 'image') { eventsService.publish("Umbraco.Dialogs.MediaPickerController.Select", image).then(function(image){ if(dialogOptions && dialogOptions.multipicker){ $scope.select(image); }else{ - $scope.submit(image); + $scope.submit(image); } }); } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html index 88b69a7e65..68660a25ee 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html @@ -63,28 +63,26 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl ng-click="selectMediaItem(image)" prevent-default> + {{image.name}} - {{image.name}} - - -
    - {{image.name}} - -
    - - {{image.name}} -
    -
    - +
    + + {{image.name}} +
    +
    • -
    - +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js index bc1ad1582a..d40c97f599 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js @@ -7,31 +7,26 @@ * The controller for deleting content */ function ContentSortController($scope, contentResource, treeService) { - - $scope.sortableModel = { - itemsToSort: [], - name: $scope.nav.ui.currentNode.name - }; - contentResource.getChildren($scope.currentNode.id).then(function (data) { - $scope.sortableModel.itemsToSort = []; + $scope.pagesToSort = []; for (var i = 0; i < data.items.length; i++) { - $scope.sortableModel.itemsToSort.push({ + $scope.pagesToSort.push({ id: data.items[i].id, - column1: data.items[i].name, - column2: data.items[i].updateDate, - column3: data.items[i].sortOrder + name: data.items[i].name, + updateDate: data.items[i].updateDate, + sortOrder: data.items[i].sortOrder }); } }); - $scope.$on("umbItemSorter.ok", function(event) { - $scope.nav.hideDialog(); - }); - $scope.$on("umbItemSorter.cancel", function (event) { - $scope.nav.hideDialog(); - }); + $scope.sortOptions ={ + group: "pages", + onSortHandler: function(item, args){ + args.scope.changeIndex(args.oldIndex, args.newIndex); + } + }; +/* $scope.$on("umbItemSorter.sorting", function (event, args) { var sortedIds = []; @@ -43,8 +38,7 @@ function ContentSortController($scope, contentResource, treeService) { $scope.sortableModel.complete = true; treeService.loadNodeChildren({ node: $scope.nav.ui.currentNode, section: $scope.nav.ui.currentSection }); }); - - }); + });*/ } diff --git a/src/Umbraco.Web.UI.Client/src/views/content/sort.html b/src/Umbraco.Web.UI.Client/src/views/content/sort.html index 958dbdaf2c..c86851929a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/sort.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/sort.html @@ -1,3 +1,13 @@ -
    - +
    + + +{{ pagesToSort | json}}
    + + + diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html index 3384a18580..37e1030614 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html @@ -1,3 +1,3 @@ -
    +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html index 65819d3631..cfed867ae2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html @@ -1,4 +1,4 @@ -
    +
    • diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html index 4b6d47b459..5174b87047 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html @@ -1,4 +1,4 @@ -
      +
      \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html index 25921f3c0e..bbaa8b3c23 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html @@ -1,4 +1,4 @@ -
      +
      +
      diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js index ef63dfdf65..a8b4d3f6c5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js @@ -1,10 +1,29 @@ angular.module("umbraco") +.directive("umbUploadPreview",function($parse){ + return { + link: function(scope, element, attr, ctrl) { + var fn = $parse(attr.umbUploadPreview), + file = fn(scope); + if (file.preview) { + element.append(file.preview); + } + } + }; +}) .controller("Umbraco.Editors.FolderBrowserController", - function ($rootScope, $scope, assetsService, $routeParams, umbRequestHelper, mediaResource, imageHelper) { + function ($rootScope, $scope, assetsService, $routeParams, $timeout, umbRequestHelper, mediaResource, imageHelper) { var dialogOptions = $scope.$parent.dialogOptions; + + $scope.filesUploading = []; + $scope.options = { url: umbRequestHelper.getApiUrl("mediaApiBaseUrl", "PostAddFile"), autoUpload: true, + disableImageResize: /Android(?!.*Chrome)|Opera/ + .test(window.navigator.userAgent), + previewMaxWidth: 100, + previewMaxHeight: 100, + previewCrop: true, formData:{ currentFolder: $routeParams.id } @@ -23,7 +42,33 @@ angular.module("umbraco") $scope.$on('fileuploadstop', function(event, files){ $scope.loadChildren($scope.options.formData.currentFolder); + $scope.queue = []; }); + + $scope.$on('fileuploadprocessalways', function(e,data) { + var i; + console.log('processing'); + + $scope.$apply(function() { + $scope.filesUploading.push(data.files[data.index]); + }); + }) + + + // All these sit-ups are to add dropzone area and make sure it gets removed if dragging is aborted! + $scope.$on('fileuploaddragover', function(event, files) { + if (!$scope.dragClearTimeout) { + $scope.$apply(function() { + $scope.dropping = true; + }); + } else { + $timeout.cancel($scope.dragClearTimeout); + } + $scope.dragClearTimeout = $timeout(function () { + $scope.dropping = null; + $scope.dragClearTimeout = null; + }, 100); + }) //init load $scope.loadChildren($routeParams.id); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html index a75c2e7d37..0640fd9e96 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html @@ -1,14 +1,30 @@
      +method="POST" enctype="multipart/form-data" +class="umb-editor umb-folderbrowser" +data-file-upload="options" +data-file-upload-progress="" +data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
      +
      DROP HERE
      + +
      + NOW UPLOADING... +
        +
      • +
        +
        • +
      +
      + +
      • - {{image.name}} + +
        {{image.name}} diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html index d660956e92..e7424bf23a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html @@ -1,3 +1,3 @@ -
        +
        \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html index 534cc3e751..29fd896c75 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html @@ -1,3 +1,3 @@ -
        +
        \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html index 67e9be3de5..ad5ac2d6e1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html @@ -1,4 +1,4 @@ -
        +
        +
        @@ -9,8 +9,11 @@
        diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js index 8d2385f409..c028217f71 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js @@ -2,48 +2,53 @@ //with a specified callback, this callback will receive an object with a selection on it angular.module('umbraco').controller("Umbraco.Editors.MediaPickerController", function($rootScope, $scope, dialogService, mediaResource, imageHelper, $log){ - // - //$( "#draggable" ).draggable(); + + + $scope.images = []; + $scope.ids = []; + if($scope.model.value){ + $scope.ids = $scope.model.value.split(','); - //saved value contains a list of images with their coordinates a Dot coordinates - //this will be $scope.model.value... - var sampleData = [ - {id: 1143, coordinates: {x:123,y:345}, center: {x:123,y:12}}, - {id: 1144, coordinates: {x:123,y:345}, center: {x:123,y:12}}, - {id: 1145, coordinates: {x:123,y:345}, center: {x:123,y:12}}, - ]; - - $scope.images = sampleData; - $($scope.images).each(function(i,img){ - mediaResource.getById(img.id).then(function(media){ + mediaResource.getByIds($scope.ids).then(function(medias){ //img.media = media; - - //shortcuts - //TODO, do something better then this for searching - img.src = imageHelper.getImagePropertyValue({imageModel: media}); - img.thumbnail = imageHelper.getThumbnailFromPath(img.src); + $(medias).each(function(i, media){ + //shortcuts + //TODO, do something better then this for searching + var img = {}; + img.src = imageHelper.getImagePropertyValue({imageModel: media}); + img.thumbnail = imageHelper.getThumbnailFromPath(img.src); + $scope.images.push(img); + }); }); - }); + } - //List of crops with name and size - $scope.config = { - crops: [ - {name: "default", x:300,y:400}, - {name: "header", x:23,y:40}, - {name: "tiny", x:10,y:10} - ]}; + $scope.remove = function(index){ + $scope.images.splice(index, 1); + $scope.ids.splice(index, 1); + $scope.sync(); + }; + $scope.add = function(){ + dialogService.mediaPicker({multipicker:true, callback: function(data){ + $(data.selection).each(function(i, media){ + //shortcuts + //TODO, do something better then this for searching - $scope.openMediaPicker =function(value){ - var d = dialogService.mediaPicker({scope: $scope, callback: populate}); - }; + var img = {}; + img.id = media.id; + img.src = imageHelper.getImagePropertyValue({imageModel: media}); + img.thumbnail = imageHelper.getThumbnailFromPath(img.src); + $scope.images.push(img); + $scope.ids.push(img.id); + }); - $scope.crop = function(image){ - $scope.currentImage = image; - }; + $scope.sync(); + }}); + }; - function populate(data){ - $scope.model.value = data.selection; - } - }); + $scope.sync = function(){ + $scope.model.value = $scope.ids.join(); + }; + +}); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html index 0d90298811..fc2e061b49 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html @@ -1,41 +1,17 @@ -
        +
        -
        -
        - - - -
        - -
        - - - -
        -
        - - - - -
        \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html index dea098a5a6..3492ac76d7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html @@ -1,4 +1,4 @@ -
        +
        diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html index 3bef0f117d..c526f13b09 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html @@ -1,4 +1,4 @@ -
        +