account and portraits

Author: sklett-src

app/models/account.rb

@@ -210,7 +210,20 @@ def set_expected_portrait!
   # Yes, it's presentation in a model, I'm sorry. The way we currently work,
   # we need this in the objects attributes for the frontend.
   def portrait_css(expected = false, size = 75)
+    #print "TEST"
     _portrait = expected ? expected_portrait : portrait
+
+begin
+    puts "ACC:3 " + _portrait
+rescue SystemCallError
+    puts "ACC:2 " + _portrait
+	
+#  raise
+end
+
+   # puts "ACC: " + expected if expected?
+    #puts "ACC: " + expected_portrait
+
     return 'display: none;' if !_portrait || _portrait.blank?
     portrait_position = BnetScraper::Starcraft2.portrait_position(_portrait)
     if portrait_position.present?

app/views/home/_support.html

@@ -5,7 +5,7 @@
 		padding:0.62em;
 	}
 	article {
-		font:1.2em/1.62 sans-serif;
+		font:1.05em/1.47 sans-serif;
 	}
 
 	h15,h25,h35 {

app/views/players/show.html.erb

@@ -1,3 +1,6 @@
+<script>
+console.log('test')
+</script>
 <div id="player" ng-controller="PlayerController">
   <div id="heading" class="inset">
     <div class="content player">

app/views/users/_accounts.html.erb

@@ -28,7 +28,7 @@
           <a href class="ggtipper underline clicky" ng-click="toggle()" data-gravity="nw"><span class="tiny" >Example</span></a>
             <div class="ggtipcontent">
             <div id="find-your-profile" class="settings-tip">
-            <p>Tell us about your Battle.Net Account so we can customize GGTracker for you. Here's how:</p><br>
+            <p>Tell us about your Battle.Net Account so we can customize GGGReplays for you. Here's how:</p><br>
 
             <ul>
             <li>Log into Battle.Net by clicking <a target="_blank" href="http://battle.net/sc2?login">here</a></li>
@@ -61,7 +61,7 @@
 
               <p>and then hit the UPDATE button.  Afterwards, you may change your portrait back.</p>
               <br>
-              <p>(There's a bug with the 4th Anniversary portraits, please change to something else for the authentication process)</p>
+              <p>(There's a bug with some portraits, please change to something else (Kachinsky) for the authentication process)</p>
             </div>
           </div>
           <br />
@@ -98,6 +98,6 @@
   <% if false %>
   <a class="add" href ng-click="addAccount()">GGGReplays Pro: Add Another Account</a>
   <br>
-  <a class="add" href="cancel">Cancel GGTracker Pro</a>
+  <a class="add" href="cancel">Cancel GGGReplays Pro</a>
   <% end %>
 </div>

lib/patch/bnet_scraper.rb

@@ -7,6 +7,8 @@ module BnetScraper
   module Starcraft2
     # Returns the map file and position of a portrait by name
     def self.portrait_position(name)
+      print "Apple "
+      print "Apple puts"
       index = PORTRAITS.flatten(1).collect(&:downcase).index(name.to_s.downcase)
       if index.nil?
         return nil
@@ -34,4 +36,4 @@ def portrait_css(size = 75)
       "background: url('/assets/sc2/portraits/#{portrait_position[0]}-#{size}.jpg') -#{portrait_position[1]*size}px -#{portrait_position[2]*size}px no-repeat;"
     end
   end
-end
+end

spec/models/account_spec.rb

@@ -48,7 +48,7 @@
   it 'should output correct portrait_css' do
     account = Account.new
     account.portrait = 'Thatcher'
-
+#	puts "ACC:4"
     account.portrait_css(false, 75).should == "background: url('/assets/sc2/portraits/0-75.jpg') -150px -0px no-repeat;"
   end
 end