Add Bootstrap 3, and start developing the mockup.

barriosnahuel · Aug 25, 2013 · 22a8fbc · 22a8fbc
1 parent 32fe473
commit 22a8fbc
Show file tree

Hide file tree

Showing 185 changed files with 43,987 additions and 2 deletions.
diff --git a/css/spoken-today-nuevo.css b/css/spoken-today-nuevo.css
@@ -0,0 +1,25 @@
+/*
+ * Spoken Today - The things that are spoken today, from all points of view, and in one place.
+ * Copyright (C) 2013 Nahuel Barrios <[email protected]>.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/***************************************************************************************************/
+/*************************** Estilos por default para los elementos HTML ***************************/
+
+body {
+    background: url('../img/hexellence.png') repeat;
+    margin-top: 60px;
+}
diff --git a/index-nuevo.html b/index-nuevo.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="shortcut icon" href="img/1370895148_rss.png">
+
+    <title>Spoken Today (the top things...)</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="lib/bootstrap-3.0.0/dist/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="css/spoken-today-nuevo.css" rel="stylesheet">
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+    <script src="lib/bootstrap-3.0.0/assets/js/html5shiv.js"></script>
+    <script src="lib/bootstrap-3.0.0/assets/js/respond.min.js"></script>
+    <![endif]-->
+</head>
+
+<body>
+
+<header>
+    <div class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container">
+
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="#">Spoken Today</a>
+            </div>
+
+            <div class="navbar-collapse collapse">
+                <form class="navbar-form navbar-left">
+                    <div class="form-group">
+                        <input type="text" placeholder="Wanna know about..." class="form-control" tabindex="1">
+                    </div>
+                </form>
+
+                <ul class="nav navbar-nav">
+                    <li class="active"><a href="#top" data-toggle="tab"><span class="glyphicon glyphicon-star"></span>Top</a></li>
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Local <b class="caret"></b></a>
+                        <ul class="dropdown-menu">
+                            <li><a href="#">Action</a></li>
+                            <li><a href="#">Another action</a></li>
+                        </ul>
+                    </li>
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Global news! <b class="caret"></b></a>
+                        <ul class="dropdown-menu">
+                            <li><a href="#">Action</a></li>
+                            <li><a href="#">Another action</a></li>
+                        </ul>
+                    </li>
+                    <li><a href="#home" data-toggle="tab">Home</a></li>
+                    <li><a href="#profile" data-toggle="tab">Profile</a></li>
+                </ul>
+            </div>
+            <!--/.navbar-collapse -->
+        </div>
+    </div>
+</header>
+
+<div class="container">
+    <!-- Example row of columns -->
+    <div class="row">
+        <div class="col-md-12">
+            <div class="tab-content">
+                <section class="tab-pane active fade" id="top">
+                    <div class="row">
+                        <div class="col-md-2">
+                            izq
+                        </div>
+                        <div class="col-md-8">
+                            <h2>top</h2>
+                        </div>
+                        <div class="col-md-2">
+                            der
+                        </div>
+                    </div>
+
+                </section>
+                <section class="tab-pane fade" id="home">
+                    <div class="row">
+                        <div class="col-md-2">
+                            izq
+                        </div>
+                        <div class="col-md-8">
+                            <h2>home</h2>
+                        </div>
+                        <div class="col-md-2">
+                            der
+                        </div>
+                    </div>
+                </section>
+                <section class="tab-pane fade" id="profile">
+                    <div class="row">
+                        <div class="col-md-2">
+                            izq
+                        </div>
+                        <div class="col-md-8">
+                            <h2>profile</h2>
+                        </div>
+                        <div class="col-md-2">
+                            der
+                        </div>
+                    </div>
+                </section>
+            </div>
+        </div>
+    </div>
+
+    <hr>
+
+    <footer>
+        <p>&copy; Company 2013</p>
+    </footer>
+</div>
+<!-- /container -->
+
+
+<!-- Bootstrap core JavaScript
+================================================== -->
+<!-- Placed at the end of the document so the pages load faster -->
+<script src="lib/bootstrap-3.0.0/assets/js/jquery.js"></script>
+<script src="lib/bootstrap-3.0.0/dist/js/bootstrap.min.js"></script>
+</body>
+</html>
diff --git a/js/app/ui/index.js b/js/app/ui/index.js
@@ -266,9 +266,9 @@ app.ui.index = (function () {
 
             form.init();
 
-            findLocalTrends();
+//            findLocalTrends();
             $.when(app.service.google.search.findTrends(undefined)).done(onSuccessGoogleGlobalSearch);
-            $.when(app.service.socialNetworks.twitter.findGlobalTrends()).done(onSuccessTwitterGlobalSearch);
+//            $.when(app.service.socialNetworks.twitter.findGlobalTrends()).done(onSuccessTwitterGlobalSearch);
         };
 
         return {

diff --git a/lib/bootstrap-3.0.0/.editorconfig b/lib/bootstrap-3.0.0/.editorconfig
@@ -0,0 +1,11 @@
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/lib/bootstrap-3.0.0/.gitignore b/lib/bootstrap-3.0.0/.gitignore
@@ -0,0 +1,44 @@
+# Ignore compiled docs
+_gh_pages
+_site
+
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.zip
+*.vi
+*~
+*.sass-cache
+*.ruby-version
+
+# OS or Editor folders
+.DS_Store
+._*
+Thumbs.db
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+nbproject
+*.sublime-project
+*.sublime-workspace
+
+# Komodo
+*.komodoproject
+.komodotools
+
+# grunt-html-validation
+validation-staus.json
+
+# Folders to ignore
+.hg
+.svn
+.CVS
+.idea
+node_modules
diff --git a/lib/bootstrap-3.0.0/.travis.yml b/lib/bootstrap-3.0.0/.travis.yml
@@ -0,0 +1,11 @@
+language: node_js
+node_js:
+  - 0.8
+before_script:
+  - gem install jekyll
+  - npm install -g grunt-cli
+env:
+  global:
+  - secure: Besg41eyU+2mfxrywQ4ydOShMdc34ImaO0S0ENP+aCOBuyNBIgP59wy5tBMmyai2/8eInYeVps4Td96mWInMMxzTe3Bar7eTLG5tWVKRSr/wc4NBPZ/ppoPAmCEsz9Y+VptRH9/FO8n7hsL9EFZ+xBKbG+C0SccGoyBDpA5j7/w=
+  - secure: Ptiv7phCImFP3ALIz+sMQzrZg8k7C1gLZbFBhWxjnQr3g06wIfX3Ls5y9OHvxid+lOZZjISui3wzBVgpVHqwHUYf96+r0mo6/mJ+F4ffUmShZANVaIMD/JRTnXhUQJbvntGLvxn1EYWPdNM+2IHJrMipnjHxU9tkgAnlel4Zdew=
+  - TWBS_HAVE_OWN_BROWSERSTACK_KEY: ""
diff --git a/lib/bootstrap-3.0.0/CNAME b/lib/bootstrap-3.0.0/CNAME
@@ -0,0 +1 @@
+getbootstrap.com
diff --git a/lib/bootstrap-3.0.0/CONTRIBUTING.md b/lib/bootstrap-3.0.0/CONTRIBUTING.md
@@ -0,0 +1,66 @@
+# Contributing to Bootstrap
+
+Looking to contribute something to Bootstrap? **Here's how you can help.**
+
+
+
+## Reporting issues
+
+We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Bootstrap core. Please read the following guidelines before opening any issue.
+
+1. **Search for existing issues.** We get a lot of duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
+2. **Create an isolated and reproducible test case.** Be sure the problem exists in Bootstrap's code with a [reduced test case](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
+3. **Include a live example.** Make use of jsFiddle or jsBin to share your isolated test cases.
+4. **Share as much information as possible.** Include operating system and version, browser and version, version of Bootstrap, customized or vanilla build, etc. where appropriate. Also include steps to reproduce the bug.
+
+
+
+## Key branches
+
+- `master` is the latest, deployed version.
+- `gh-pages` is the hosted docs (not to be used for pull requests).
+- `*-wip` is the official work in progress branch for the next release.
+
+
+
+## Pull requests
+
+- Try to submit pull requests against the latest `*-wip` branch for easier merging
+- CSS changes must be done in .less files first, never just the compiled files
+- If modifying the .less files, always recompile and commit the compiled files bootstrap.css and bootstrap.min.css
+- Try not to pollute your pull request with unintended changes--keep them simple and small
+- Try to share which browsers your code has been tested in before submitting a pull request
+
+
+
+## Coding standards
+
+### HTML
+
+- Two spaces for indentation, never tabs
+- Double quotes only, never single quotes
+- Always use proper indentation
+- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
+
+### CSS
+
+- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
+- Multiple-line approach (one property and value per line)
+- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`)
+- End all lines with a semi-colon
+- For multiple, comma-separated selectors, place each selector on its own line
+- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
+
+### JS
+
+- No semicolons
+- Comma first
+- 2 spaces (no tabs)
+- strict mode
+- "Attractive"
+
+
+
+## License
+
+By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE