diff --git a/app/assets/images/home_bg.png b/app/assets/images/home_bg.png index 5fce9a00..d21a08f8 100644 Binary files a/app/assets/images/home_bg.png and b/app/assets/images/home_bg.png differ diff --git a/app/assets/images/home_bg2.png b/app/assets/images/home_bg2.png new file mode 100644 index 00000000..32cc8229 Binary files /dev/null and b/app/assets/images/home_bg2.png differ diff --git a/app/assets/images/white-curved-arrow.png b/app/assets/images/white-curved-arrow.png new file mode 100644 index 00000000..50ebee68 Binary files /dev/null and b/app/assets/images/white-curved-arrow.png differ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0fbd9dd1..7a3dfa9b 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -56,7 +56,8 @@ var labelType, useGradients, nativeTextSupport, animate, json, Mconsole = null, var lT; $(".logo").hover( function () { - clearTimeout(lT); + $('.menuflag').hide(); + clearTimeout(lT); if (! sliding1) { sliding1 = true; var listLength = $('.logo .menu li').length * 28; diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 38f28339..b23aa5ff 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -282,13 +282,6 @@ input[type="submit"] { /* --- top options --*/ -.passwordnotice { - background: #612127; - padding: 10px; - margin-bottom: 10px; - text-align: center; -} - .notice.metamaps, .alert.metamaps { position: absolute; margin: 20px; @@ -732,13 +725,50 @@ box-shadow: 6px 6px 8px rgba(0,0,0,0.4); display:block; } + +.menuflag { +position: absolute; +left: 71px; +bottom: 52px; +width: 100px; +height: 54px; +} +.menuflag .menuarrow { +background: url('white-curved-arrow.png') no-repeat; +background-size: contain; +width: 40px; +height: 40px; +float: left; +margin-top: 12px; +margin-right: 4px; +} +.menuflag .menutext { +float: left; +font-size: 21px; +} + .home_bg { - background: url('home_bg.png') no-repeat; overflow-y:scroll; display:block; height:100%; } +#homeMap { +height: 350px; +width: 510px; +margin: 0 auto; +transform: rotate(18deg); +-ms-transform: rotate(18deg); +-webkit-transform: rotate(18deg); +} +#homeMap-label div.node{ +transform: rotate(-18deg); +-ms-transform: rotate(-18deg); +-webkit-transform: rotate(-18deg); +font-family: 'vinyl'; +text-transform: uppercase; +} + .home_content { width: 830px; margin:0 auto; @@ -753,8 +783,9 @@ font-style: oblique; text-transform: uppercase; font-family: 'vinyl'; font-size: 40px; -margin: 20px; +margin: 40px 20px 25px; text-align:center; +background: url('home_bg2.png') no-repeat center -46px; } .contact { diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 7d7061e6..7cb2f870 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -7,7 +7,7 @@ class MainController < ApplicationController def home @maps = Map.visibleToUser(@current, nil).sort! { |a,b| b.created_at <=> a.created_at } - @maps = @maps.slice(0,3) + @maps = @maps.slice(0,5) respond_with(@maps) end diff --git a/app/views/main/console.html.erb b/app/views/main/console.html.erb index 7f1173b8..13148fa5 100644 --- a/app/views/main/console.html.erb +++ b/app/views/main/console.html.erb @@ -46,5 +46,3 @@ <%= render :partial => 'find' %> -<%= render :partial => 'analyze' %> -<%= render :partial => 'organize' %> diff --git a/app/views/main/home.html.erb b/app/views/main/home.html.erb index 564c76b0..9c4f33d8 100644 --- a/app/views/main/home.html.erb +++ b/app/views/main/home.html.erb @@ -8,29 +8,22 @@
- To get in touch, follow or tweet at us! @metamapps. + To get in touch, follow or tweet @metamapps, or join our Google+ community.
- Creative designs by Gavin Keech.
+ Status: INVITE-ONLY BETA
+ request invite : visit the blog
"+e+" topics
"+t+" synapses
")}function closeAnalyze(){analyzeOpen=!1,$("#closeAnalyze").css("display","none"),$("#sideOptionAnalyze").css("cursor","pointer"),$("#sideOptionAnalyze").animate({width:"64px",height:"32px"},100)}function switchVisible(e,t){categoryVisible[e]==1?hideCategory(e,t):categoryVisible[e]==0&&showCategory(e,t)}function hideCategory(e,t){t==null&&(t=500),Mconsole.graph.eachNode(function(t){t.getData("metacode")==e&&(t.setData("alpha",.4,"end"),t.eachAdjacency(function(e){e.setData("alpha",.4,"end")}))}),Mconsole.fx.animate({modes:["node-property:alpha","edge-property:alpha"],duration:t})}function showCategory(e,t){t==null&&(t=500),Mconsole.graph.eachNode(function(t){t.getData("metacode")==e&&(t.setData("alpha",1,"end"),t.eachAdjacency(function(e){e.setData("alpha",1,"end")}))}),Mconsole.fx.animate({modes:["node-property:alpha","edge-property:alpha"],duration:t})}function hideAll(e){e==null&&(e=500),Mconsole.graph.eachNode(function(e){!e.getData("greenCircle")&&!e.getData("whiteCircle")&&(e.setData("alpha",.4,"end"),e.eachAdjacency(function(e){e.setData("alpha",.4,"end")}))}),Mconsole.fx.animate({modes:["node-property:alpha","edge-property:alpha"],duration:e})}function showAll(e){e==null&&(e=500),Mconsole.graph.eachNode(function(e){e.setData("alpha",1,"end"),e.eachAdjacency(function(e){e.setData("alpha",1,"end")})}),Mconsole.fx.animate({modes:["node-property:alpha","edge-property:alpha"],duration:e})}function onCanvasSearch(e,t,n){e=name.toLowerCase(),Mconsole.graph.eachNode(function(r){nodeName=r.name.toLowerCase(),name!=null?nodeName.indexOf(e)!==-1&&e!=""?r.setData("whiteCircle",!0):r.setData("whiteCircle",!1):t!=null?r.getData("inmaps").indexOf(parseInt(t))!==-1?r.setData("whiteCircle",!0):r.setData("whiteCircle",!1):n!=null&&(r.getData("userid").toString()==n?r.setData("whiteCircle",!0):r.setData("whiteCircle",!1)),Mconsole.plot()})}function clearCanvas(){Mconsole.graph.eachNode(function(e){Mconsole.graph.removeNode(e.id),Mconsole.labels.disposeLabel(e.id),delete Mconsole.labels.labels[""+e.id]}),Mconsole.plot()}function clearCanvasExceptRoot(){var e=new Array;Mconsole.graph.eachNode(function(t){e.push(t.id)});var t=Mconsole.graph.nodes[Mconsole.root];e.forEach(function(e,n){e!=t.id&&(Mconsole.graph.removeNode(e),Mconsole.labels.hideLabel(e),$("#topic_"+e+"_label").hide())}),fetchRelatives(t)}function clearFoundData(){Mconsole.graph.eachNode(function(e){e.getData("greenCircle")===!0&&(Mconsole.graph.removeNode(e.id),Mconsole.labels.hideLabel(e.id),$("#topic_"+e.id+"_label").hide())}),Mconsole.plot()}function openFind(){findOpen=!0,analyzeOpen&&closeAnalyze(),organizeOpen&&closeOrganize(),$("#sideOptionFind, #closeFind").css("z-index","10"),$("#sideOptionAnalyze").css("z-index","9"),$("#sideOptionOrganize").css("z-index","8"),firstVal=$('#sideOptionFind option[value="name"]').attr("selected"),secondVal=$('#sideOptionFind option[value="metacode"]').attr("selected"),thirdVal=$('#sideOptionFind option[value="map (by name)"]').attr("selected"),fourthVal=$('#sideOptionFind option[value="mapper (by name)"]').attr("selected"),firstVal==="selected"||thirdVal==="selected"||fourthVal==="selected"?$("#sideOptionFind").animate({width:"305px",height:"76px"},100,function(){$("#topic_by_name_input").focus()}):secondVal==="selected"?$("#sideOptionFind").animate({width:"380px",height:"463px"},100,function(){}):thirdVal==="selected"?$("#sideOptionFind").animate({width:"305px",height:"76px"},100,function(){$("#map_by_name_input").focus()}):fourthVal==="selected"&&$("#sideOptionFind").animate({width:"305px",height:"76px"},100,function(){$("#mapper_by_name_input").focus()}),$("#closeFind, #findWhere").css("display","block"),$("#sideOptionFind").css("cursor","default")}function closeFind(){clearFoundData(),findOpen=!1,$("#closeFind, #findWhere").css("display","none"),$("#sideOptionFind").css("cursor","pointer"),$("#sideOptionFind").animate({width:"45px",height:"32px"},100)}function selectEdgeOnClickHandler(e,t){if(Mconsole.busy)return;if(t.altKey){editEdge(e,t);return}var n=MetamapsModel.selectedEdges.indexOf(e);n==-1?n=!1:n!=-1&&(n=!0),n&&t.shiftKey?deselectEdge(e):!n&&t.shiftKey?selectEdge(e):n&&!t.shiftKey?deselectAllEdges():!n&&!t.shiftKey&&(deselectAllEdges(),selectEdge(e)),Mconsole.plot()}function nodeDoubleClickHandler(e,t){keepFromCommons(e)}function enterKeyHandler(){var e=MetamapsModel.selectedNodes.slice(0),t=e.length;for(var r=0;rt |