Commit ecc11404 authored by Nick Poulden's avatar Nick Poulden
Browse files

Merge branch 'master' into comments

parents b80b35e9 6a5434cb

Rakefile

+11 −2
Original line number Diff line number Diff line
@@ -273,10 +273,19 @@ class JsDuckRunner 
      File.open(file, 'w') {|f| f.write(out) }

    end



    head_html = <<-EOHTML

      <script type="text/javascript">

        Docs.exampleBaseUrl = "#{relative_touch_path}examples/";

        if (Ext.is.Phone) { window.location = "#{relative_touch_path}examples/"; }

      </script>

      <div id="notice-text" style="display: none">

        Use <a href="http://docs.sencha.com/touch/2-0">http://docs.sencha.com/touch/2-0</a> for up to date documentation and features

      </div>

    EOHTML



    @options += [

      "--welcome", "template-min/touch-welcome.html",

      "--body-html",

        '<script type="text/javascript">Docs.exampleBaseUrl = "' + relative_touch_path + 'examples/";if (Ext.is.Phone) { window.location = "' + relative_touch_path + 'examples/"; }</script>'

      "--body-html", head_html

    ]

  end

template/app/view/examples/Inline.js

+2 −2
Original line number Diff line number Diff line
@@ -115,11 +115,11 @@ Ext.define('Docs.view.examples.Inline', { 
    // Syncs the height with number of lines in code example.

    updateHeight: function() {

        var previewHeight = this.preview.getHeight();

        var editorHeight = this.editor.getHeight();

        if (Docs.touchExamplesUi && previewHeight > 0) {

            this.setHeight(previewHeight);

        }

        else {

            var editorHeight = this.editor.getHeight();

        else if (editorHeight > 0) {

            this.setHeight(Ext.Number.constrain(editorHeight, 0, this.maxCodeHeight));

        }

    }

template/touch-welcome.html

+4 −14
Original line number Diff line number Diff line
@@ -7,14 +7,9 @@ 


  <div class="header">

    <div class="get-started">

      <a class="video" href="#"><img src="resources/images/gettingstarted.jpg" /></a>

      <h3>Get started in 5 minutes...</h3>

      <ul>

        <li>Download the framework</li>

        <li>Build a simple application</li>

        <li>Ready the app for production</li>

      </ul>

      <a href="#" class="more-icon">Watch the video</a>

      <a class="video" href="#!/guide/getting_started"><img src="resources/images/gettingstarted.jpg" /></a>

      <h3>Get Started with 2.0</h3>

      <p>Follow this simple guide to get started with Sencha Touch 2. We'll build a small website app with a welcome page, a list and a form</p>

      <a href="#!/guide/getting_started" class="more-icon">Read the guide</a>

    </div>
@@ -22,12 +17,7 @@ 
      <h3>What's new in Touch 2.0</h3>

      <img src="guides/whats_new/icon-lg.png" />

      <div class="right">

        <ul>

          <li>MVC System</li>

          <li>New Layout</li>

          <li>Better Performance</li>

          <li>Class System</li>

        </ul>

        <p>Sencha Touch 2 is all about performance, ease of use and great docs. Here's a guide to all that's new</p>

        <a href="#!/guide/whats_new" class="more-icon">Read the guide</a>

      </div>

    </div>