diff options
46 files changed, 36 insertions, 88 deletions
diff --git a/COPYING-README b/COPYING-README index b0caca2ad21..49e035186ed 100644 --- a/COPYING-README +++ b/COPYING-README @@ -2,13 +2,14 @@ Files in ownCloud are licensed under the Affero General Public License version 3 the text of which can be found in COPYING-AGPL, or any later version of the AGPL, unless otherwise noted. -Components of ownCloud: -* jQuery is dual licensed under MIT and GPL -* HTTP is three clause BSD license -* MDB2 uses a custom license in the BSD style -* User is AGPL -* XML/RPC is both MIT and PHP license +Licensing of components: +* jQuery: MIT / GPL +* HTTP: 3 clause BSD +* MDB2: BSD style custom +* User: AGPL +* XML/RPC: MIT / PHP +* Silk icons: Creative Commons Attribution All unmodified files from these and other sources retain their original copyright and license notices: see the relevant individual files. -Attribution information for ownCloud is contained in the AUTHORS file. +Attribution information for ownCloud is contained in the AUTHORS file.
\ No newline at end of file diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css index 14b7d45523e..80d29ca8974 100644 --- a/apps/calendar/css/style.css +++ b/apps/calendar/css/style.css @@ -58,5 +58,5 @@ color:#A9A9A9; select#category{width:140px;} button.category{margin:0 3px;} -.calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;} -.calendar-colorpicker-color.active{background-image:url("../../../core/img/actions/selected.svg");background-position:2px 2px;} +.calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;border:2px solid transparent;} +.calendar-colorpicker-color.active{border:2px solid black;} diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index 131325007a0..87954b7aac6 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -491,8 +491,6 @@ Calendar={ // based on jquery-colorpicker at jquery.webspirited.com var obj = $('.colorpicker', container); var picker = $('<div class="calendar-colorpicker"></div>'); - var size = 20; - //build an array of colors var colors = {}; $(obj).children('option').each(function(i, elm) { @@ -501,7 +499,7 @@ Calendar={ colors[i].label = $(elm).text(); }); for (var i in colors) { - picker.append('<span class="calendar-colorpicker-color ' + (colors[i].color == $(obj).children(":selected").val() ? ' active' : '') + '" rel="' + colors[i].label + '" style="background-color: #' + colors[i].color + '; width: ' + size + 'px; height: ' + size + 'px;"></span>'); + picker.append('<span class="calendar-colorpicker-color ' + (colors[i].color == $(obj).children(":selected").val() ? ' active' : '') + '" rel="' + colors[i].label + '" style="background-color: #' + colors[i].color + ';"></span>'); } picker.delegate(".calendar-colorpicker-color", "click", function() { $(obj).val($(this).attr('rel')); diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php index 5760bb149d8..8f855c470e5 100644 --- a/apps/gallery/appinfo/app.php +++ b/apps/gallery/appinfo/app.php @@ -8,7 +8,7 @@ OC_App::addNavigationEntry( array( 'id' => 'gallery_index', 'order' => 20, 'href' => OC_Helper::linkTo('gallery', 'index.php'), - 'icon' => OC_Helper::linkTo('', 'core/img/filetypes/image.png'), + 'icon' => OC_Helper::imagePath('core', 'places/picture.svg'), 'name' => 'Gallery')); class OC_GallerySearchProvider extends OC_Search_Provider{ @@ -17,7 +17,7 @@ OC_App::addNavigationEntry( array( $result = $stmt->execute(array(OC_User::getUser(),'%'.$query.'%')); $results=array(); while($row=$result->fetchRow()){ - $results[]=new OC_Search_Result($row['album_name'],'',OC_Helper::linkTo( 'apps/gallery', 'index.php?view='.$row['album_name']),'Galleries'); + $results[]=new OC_Search_Result($row['album_name'],'',OC_Helper::linkTo('apps/gallery', 'index.php?view='.$row['album_name']),'Galleries'); } return $results; } diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php index dd1a830a94b..475a33500f4 100644 --- a/apps/media/appinfo/app.php +++ b/apps/media/appinfo/app.php @@ -29,5 +29,5 @@ OC_APP::registerPersonal('media','settings'); OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' )); -OC_App::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo( 'media', 'index.php' ), 'icon' => OC_Helper::imagePath( 'core', 'filetypes/audio.svg' ), 'name' => $l->t('Music') )); +OC_App::addNavigationEntry(array('id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo('media', 'index.php'), 'icon' => OC_Helper::imagePath('core', 'places/music.svg'), 'name' => $l->t('Music'))); ?> diff --git a/core/img/actions/selected.png b/core/img/actions/selected.png Binary files differdeleted file mode 100644 index 98c29df9cf5..00000000000 --- a/core/img/actions/selected.png +++ /dev/null diff --git a/core/img/actions/selected.svg b/core/img/actions/selected.svg deleted file mode 100644 index 3294f68c68d..00000000000 --- a/core/img/actions/selected.svg +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="16" - height="16" - id="svg3875" - version="1.1" - inkscape:version="0.48.1 r9760" - sodipodi:docname="play.svg" - inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs3877" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="25.345359" - inkscape:cx="10.565719" - inkscape:cy="5.327912" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:window-width="1280" - inkscape:window-height="969" - inkscape:window-x="-2" - inkscape:window-y="-3" - inkscape:window-maximized="1"> - <inkscape:grid - type="xygrid" - id="grid3883" - empspacing="5" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <metadata - id="metadata3880"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(0, -1036.36)"> - <path - style="fill:#000000;fill-opacity:1;stroke:none" - d="m 14,1038.3622 -6,12 -6,-12 6,6.9978 z" - id="path3086" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccc" /> - </g> -</svg> diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png Binary files differindex 4c844425d64..a8b3ede3df9 100644 --- a/core/img/filetypes/audio.png +++ b/core/img/filetypes/audio.png diff --git a/core/img/filetypes/c.png b/core/img/filetypes/c.png Binary files differnew file mode 100644 index 00000000000..34a05cccf06 --- /dev/null +++ b/core/img/filetypes/c.png diff --git a/core/img/filetypes/code.png b/core/img/filetypes/code.png Binary files differnew file mode 100644 index 00000000000..0c76bd12977 --- /dev/null +++ b/core/img/filetypes/code.png diff --git a/core/img/filetypes/cplusplus.png b/core/img/filetypes/cplusplus.png Binary files differnew file mode 100644 index 00000000000..a87cf847cb7 --- /dev/null +++ b/core/img/filetypes/cplusplus.png diff --git a/core/img/filetypes/csharp.png b/core/img/filetypes/csharp.png Binary files differnew file mode 100644 index 00000000000..ffb8fc932f3 --- /dev/null +++ b/core/img/filetypes/csharp.png diff --git a/core/img/filetypes/css.png b/core/img/filetypes/css.png Binary files differnew file mode 100644 index 00000000000..23f3101811f --- /dev/null +++ b/core/img/filetypes/css.png diff --git a/core/img/filetypes/database.png b/core/img/filetypes/database.png Binary files differnew file mode 100644 index 00000000000..3d09261a26e --- /dev/null +++ b/core/img/filetypes/database.png diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png Binary files differindex 49790448897..8b8b1ca0000 100644 --- a/core/img/filetypes/file.png +++ b/core/img/filetypes/file.png diff --git a/core/img/filetypes/flash.png b/core/img/filetypes/flash.png Binary files differnew file mode 100644 index 00000000000..5769120b1b6 --- /dev/null +++ b/core/img/filetypes/flash.png diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png Binary files differnew file mode 100644 index 00000000000..784e8fa4823 --- /dev/null +++ b/core/img/filetypes/folder.png diff --git a/core/img/filetypes/font.png b/core/img/filetypes/font.png Binary files differnew file mode 100644 index 00000000000..81e41de7d3a --- /dev/null +++ b/core/img/filetypes/font.png diff --git a/core/img/filetypes/h.png b/core/img/filetypes/h.png Binary files differnew file mode 100644 index 00000000000..e902abb0767 --- /dev/null +++ b/core/img/filetypes/h.png diff --git a/core/img/filetypes/html.png b/core/img/filetypes/html.png Binary files differnew file mode 100644 index 00000000000..55d1072eafd --- /dev/null +++ b/core/img/filetypes/html.png diff --git a/core/img/filetypes/ical.png b/core/img/filetypes/ical.png Binary files differnew file mode 100644 index 00000000000..658913852d6 --- /dev/null +++ b/core/img/filetypes/ical.png diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png Binary files differindex 980a7c69813..4a158fef7e0 100644 --- a/core/img/filetypes/image.png +++ b/core/img/filetypes/image.png diff --git a/core/img/filetypes/link.png b/core/img/filetypes/link.png Binary files differnew file mode 100644 index 00000000000..68f21d30116 --- /dev/null +++ b/core/img/filetypes/link.png diff --git a/core/img/filetypes/model.png b/core/img/filetypes/model.png Binary files differnew file mode 100644 index 00000000000..7851cf34c94 --- /dev/null +++ b/core/img/filetypes/model.png diff --git a/core/img/filetypes/ms-excel.png b/core/img/filetypes/ms-excel.png Binary files differnew file mode 100644 index 00000000000..abcd93689a0 --- /dev/null +++ b/core/img/filetypes/ms-excel.png diff --git a/core/img/filetypes/ms-powerpoint.png b/core/img/filetypes/ms-powerpoint.png Binary files differnew file mode 100644 index 00000000000..b4aaad9a45c --- /dev/null +++ b/core/img/filetypes/ms-powerpoint.png diff --git a/core/img/filetypes/msword.png b/core/img/filetypes/msword.png Binary files differnew file mode 100644 index 00000000000..813f712f726 --- /dev/null +++ b/core/img/filetypes/msword.png diff --git a/core/img/filetypes/pdf.png b/core/img/filetypes/pdf.png Binary files differnew file mode 100644 index 00000000000..8f8095e46fa --- /dev/null +++ b/core/img/filetypes/pdf.png diff --git a/core/img/filetypes/php.png b/core/img/filetypes/php.png Binary files differnew file mode 100644 index 00000000000..7868a25945c --- /dev/null +++ b/core/img/filetypes/php.png diff --git a/core/img/filetypes/presentation.png b/core/img/filetypes/presentation.png Binary files differnew file mode 100644 index 00000000000..b4aaad9a45c --- /dev/null +++ b/core/img/filetypes/presentation.png diff --git a/core/img/filetypes/readme.txt b/core/img/filetypes/readme.txt new file mode 100644 index 00000000000..400a64d7857 --- /dev/null +++ b/core/img/filetypes/readme.txt @@ -0,0 +1,22 @@ +Silk icon set 1.3
+
+_________________________________________
+Mark James
+http://www.famfamfam.com/lab/icons/silk/
+_________________________________________
+
+This work is licensed under a
+Creative Commons Attribution 2.5 License.
+[ http://creativecommons.org/licenses/by/2.5/ ]
+
+This means you may use it for any purpose,
+and make any changes you like.
+All I ask is that you include a link back
+to this page in your credits.
+
+Are you using this icon set? Send me an email
+(including a link or picture if available) to
+mjames@gmail.com
+
+Any other questions about this icon set please
+contact mjames@gmail.com
\ No newline at end of file diff --git a/core/img/filetypes/rss.png b/core/img/filetypes/rss.png Binary files differnew file mode 100644 index 00000000000..315c4f4fa62 --- /dev/null +++ b/core/img/filetypes/rss.png diff --git a/core/img/filetypes/ruby.png b/core/img/filetypes/ruby.png Binary files differnew file mode 100644 index 00000000000..f59b7c4365f --- /dev/null +++ b/core/img/filetypes/ruby.png diff --git a/core/img/filetypes/script.png b/core/img/filetypes/script.png Binary files differnew file mode 100644 index 00000000000..63fe6ceff5b --- /dev/null +++ b/core/img/filetypes/script.png diff --git a/core/img/filetypes/spreadsheet.png b/core/img/filetypes/spreadsheet.png Binary files differnew file mode 100644 index 00000000000..abcd93689a0 --- /dev/null +++ b/core/img/filetypes/spreadsheet.png diff --git a/core/img/filetypes/svg.png b/core/img/filetypes/svg.png Binary files differnew file mode 100644 index 00000000000..a1291c2dfad --- /dev/null +++ b/core/img/filetypes/svg.png diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png Binary files differnew file mode 100644 index 00000000000..813f712f726 --- /dev/null +++ b/core/img/filetypes/text.png diff --git a/core/img/filetypes/vcf.png b/core/img/filetypes/vcf.png Binary files differnew file mode 100644 index 00000000000..c02f315d207 --- /dev/null +++ b/core/img/filetypes/vcf.png diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png Binary files differnew file mode 100644 index 00000000000..b0ce7bb198a --- /dev/null +++ b/core/img/filetypes/video.png diff --git a/core/img/filetypes/x-.png b/core/img/filetypes/x-.png Binary files differnew file mode 100644 index 00000000000..8443c23eb94 --- /dev/null +++ b/core/img/filetypes/x-.png diff --git a/core/img/places/file.png b/core/img/places/file.png Binary files differnew file mode 100644 index 00000000000..49790448897 --- /dev/null +++ b/core/img/places/file.png diff --git a/core/img/filetypes/file.svg b/core/img/places/file.svg index 478714b75d1..478714b75d1 100644 --- a/core/img/filetypes/file.svg +++ b/core/img/places/file.svg diff --git a/core/img/places/music.png b/core/img/places/music.png Binary files differnew file mode 100644 index 00000000000..4c844425d64 --- /dev/null +++ b/core/img/places/music.png diff --git a/core/img/filetypes/audio.svg b/core/img/places/music.svg index 1f397660970..1f397660970 100644 --- a/core/img/filetypes/audio.svg +++ b/core/img/places/music.svg diff --git a/core/img/places/picture.png b/core/img/places/picture.png Binary files differnew file mode 100644 index 00000000000..980a7c69813 --- /dev/null +++ b/core/img/places/picture.png diff --git a/core/img/filetypes/image.svg b/core/img/places/picture.svg index 26c3d6312c2..26c3d6312c2 100644 --- a/core/img/filetypes/image.svg +++ b/core/img/places/picture.svg |
