diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store index dc778d51..a709ceac 100644 Binary files a/app/assets/images/.DS_Store and b/app/assets/images/.DS_Store differ diff --git a/app/assets/images/homepage-bg.png b/app/assets/images/homepage-bg.png deleted file mode 100644 index 9bfb1040..00000000 Binary files a/app/assets/images/homepage-bg.png and /dev/null differ diff --git a/app/assets/images/homepage_bg.png b/app/assets/images/homepage_bg.png new file mode 100644 index 00000000..594bd17c Binary files /dev/null and b/app/assets/images/homepage_bg.png differ diff --git a/app/assets/images/mm-homepage-bg-image.png b/app/assets/images/mm-homepage-bg-image.png deleted file mode 100644 index 9bfb1040..00000000 Binary files a/app/assets/images/mm-homepage-bg-image.png and /dev/null differ diff --git a/app/assets/images/partner_logos.png b/app/assets/images/partner_logos.png new file mode 100644 index 00000000..7b1e9441 Binary files /dev/null and b/app/assets/images/partner_logos.png differ diff --git a/app/assets/images/user.png b/app/assets/images/user.png old mode 100755 new mode 100644 index 67239052..e7b41d48 Binary files a/app/assets/images/user.png and b/app/assets/images/user.png differ diff --git a/app/assets/javascripts/src/Metamaps.Backbone.js b/app/assets/javascripts/src/Metamaps.Backbone.js index 0eec6e61..2909f5d8 100644 --- a/app/assets/javascripts/src/Metamaps.Backbone.js +++ b/app/assets/javascripts/src/Metamaps.Backbone.js @@ -89,10 +89,20 @@ Metamaps.Backbone.Map = Backbone.Model.extend({ function capitalize(string) { return string.charAt(0).toUpperCase() + string.slice(1); } + + var n = this.get('name'); + var d = this.get('desc'); + + var maxNameLength = 32; + var maxDescLength = 118; + var truncatedName = n ? (n.length > maxNameLength ? n.substring(0, maxNameLength) + "..." : n) : ""; + var truncatedDesc = d ? (d.length > maxDescLength ? d.substring(0, maxDescLength) + "..." : d) : ""; + var obj = { id: this.id, - name: this.get('name'), - desc: this.get('desc'), + name: truncatedName, + fullName: n, + desc: truncatedDesc, permission: this.get("permission") ? capitalize(this.get("permission")) : "Commons", editPermission: this.authorizeToEdit(Metamaps.Active.Mapper) ? 'canEdit' : 'cannotEdit', contributor_count_number: '' + this.get('contributor_count') + '', diff --git a/app/assets/javascripts/src/Metamaps.JIT.js b/app/assets/javascripts/src/Metamaps.JIT.js index dff655ce..6099fd0f 100644 --- a/app/assets/javascripts/src/Metamaps.JIT.js +++ b/app/assets/javascripts/src/Metamaps.JIT.js @@ -1322,9 +1322,9 @@ Metamaps.JIT = { var disabled = authorized ? "" : "disabled"; - if (Metamaps.Active.Map) menustring += '
  • Hide until refresh
  • '; - if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '
  • Remove from map
  • '; - if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '
  • Delete
  • '; + if (Metamaps.Active.Map) menustring += '
  • Hide until refresh
    Ctrl+H
  • '; + if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '
  • Remove from map
    Ctrl+M
  • '; + if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '
  • Delete
    Ctrl+D
  • '; if (Metamaps.Active.Topic) { @@ -1337,6 +1337,8 @@ Metamaps.JIT = {
  • private
  • \ '; + menustring += '
  • '; + menustring += '
  • Change permissions' + options + '
  • '; var metacodeOptions = $('#metacodeOptions').html(); @@ -1344,6 +1346,11 @@ Metamaps.JIT = { menustring += '
  • Change metacode' + metacodeOptions + '
  • '; } if (Metamaps.Active.Topic) { + + if (!Metamaps.Active.Mapper) { + menustring += '
  • '; + } + // set up the get sibling menu as a "lazy load" // only fill in the submenu when they hover over the get siblings list item var siblingMenu = '