Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
  • Loading branch information
aroach committed Jun 8, 2016
2 parents 67f3436 + ce3fb2a commit c40a1e1
Show file tree
Hide file tree
Showing 57 changed files with 2,604 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules
node_modules
.DS_Store
91 changes: 89 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,89 @@
# cisco.github.io-
Public Github Pages for Cisco
cisco.github.io
===================

Source for the cisco.github.io website. Contributions are welcome.
You can also email [email protected] if you have any questions about this site or the
Cisco GitHub organization in general.

How to contribute?
=====================

1. Before starting work on a new feature, enhancement, or fix, please create an issue and optionally assign it to yourself or a developer.
1. Fork the repository and make your changes against the 'development' branch (not master).
1. After making your changes in your fork, run tests and ensure that the page looks good and works with all supported browsers.
1. If you have made a series of commits into the 'development' branch, please try to squash them into a small number of commits.
1. Issue a Pull Request against the 'development' branch (not master).
1. The admins will review your code and may optionally request conformance, functional or other changes. Work with them to resolve any issues.
1. Upon acceptance, your code will be merged into the master branch and will become available for all.

Dont See Your Project Here?
===========================
1. Your project must have a description- please make it clear enough for someone to understand given Cisco's broad product portfolio
1. Your project must have a LICENSE file.
2. Your project must have a Readme.md file - please ensure your readme provides enough detials to get a user started with the project or pointed in the right direction quickly and link to other relevant projects, wikis, or public documenation
3. Your project must have activity within the last 90 days
4. Your project can't be a fork
5. Your project must be in the list of Cisco Organizations below

If your project meets these criteria and is still not present please contact [email protected]

To add a project to the organizations below please submit a pull request.

List of Cisco Organizations on GitHub
=========================================

- https://github.com/Cisco
- https://github.com/CiscoCloud
- https://github.com/CiscoDevNet
- https://github.com/CiscoIOx
- https://github.com/ciscospark
- https://github.com/datacenter
- https://github.com/CiscoSystems
- https://github.com/isco-open-source
- https://github.com/CiscoVE
- https://github.com/CiscoDevNet
- https://github.com/CiscoUKIDCDev
- https://github.com/Cisco-USTC
- https://github.com/CiscoZeus
- https://github.com/CiscoKorea
- https://github.com/CIscoTrainingonDemand
- https://github.com/CiscoUcs
- https://github.com/Cisco-oss-eng
- https://github.com/Cisco-system-traffic-generator
- https://github.com/CiscoVIRL
- https://github.com/Cisco-OCPChina
- https://github.com/Ciscocommerce
- https://github.com/jungo-home
- https://github.com/CiscoSystems-Netconf
- https://github.com/Cisco-Meraki-CFG
- https://github.com/CiscoPackagingExpress
- https://github.com/CiscoHackathon
- https://github.com/CiscoCTA
- https://github.com/Cisco-nam
- https://github.com/Ciscosspg
- https://github.com/Cisco-cloud
- https://github.com/LearningAtCisco
- https://github.com/Cisco-china
- https://github.com/Ciscosystem
- https://github.com/CiscoDevSeries
- https://github.com/Cisco-TestScheduling
- https://github.com/CISCO9
- https://github.com/Cisco001
- https://github.com/Cisco-DCG-Power
- https://github.com/Cisco-ccsp
- https://github.com/CiscoSystemsInc'

Development
===========

* Tested with Node v5.3.0
* Fork/Clone this repo
* `npm install`
* `gulp`

License
=======

(Cisco License)[LICENSE]

Thanks!
26 changes: 26 additions & 0 deletions data/featured.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[
{
"title": "spark-java-sdk",
"desc": "Java library for consuming RESTful APIs for Cisco Spark",
"githubUrl": "https://github.com/ciscospark/spark-java-sdk",
"forks": 4,
"stars": 8,
"org": "ciscospark"
},
{
"title": "nova",
"desc": "OpenStack Compute (Nova)",
"githubUrl": "https://github.com/CiscoSystems/nova",
"forks": 12,
"stars": 4,
"org": "CiscoSystems"
},
{
"title": "mantl",
"desc": "Mantl is a modern platform for rapidly deploying globally distributed services",
"githubUrl": "https://github.com/CiscoCloud/mantl",
"forks": 282,
"stars": 2127,
"org": "CiscoCloud"
}
]
1 change: 1 addition & 0 deletions data/projects.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/repos.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/stats.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"title":"Total Forks and Stars","stars":3877,"forks":1283,"repos":78}
Binary file added favicon.ico
Binary file not shown.
19 changes: 19 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
var gulp = require('gulp'),
server = require('gulp-server-livereload');


gulp.task('serve', function() {

gulp.src('.')
.pipe(server({
livereload: true,
open: true,
filter: function (filename, cb) {
cb( !(/.git|node_modules/.test(filePath)) );
}
}));
});

gulp.task('default', function () {
gulp.run('serve');
});
Binary file added images/cisco-logo-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions images/cisco-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/ic_cisco_devnet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
75 changes: 75 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">

<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" />
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" />
<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/jquery.slick/1.5.9/slick.css"/>
<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/jquery.slick/1.5.9/slick-theme.css"/>

<link rel="stylesheet" href="styles/cisco.css">

</head>
<body ng-app="ciscogithubioApp" ng-controller="MainCtrl">
<!--[if lte IE 8]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->

<!-- Add your site or application content here -->

<div class="container-fluid mainHeader">
<div class="row">
<div class="col-sm-12">
<div class="container">
<div class="row">
<a class="navbar-brand" href="#"><img class="CiscoLogo" src="images/cisco-logo-white.png" alt="Cisco" /></a>
</div>
<div class="row">
<div class="col-sm-12">
<slick settings="slickConfig" ng-if="slickConfigLoaded" dots="true">
<div ng-repeat="item in carouselData track by $index">
<div ng-include="'views/partials/carousel-tmpl.html'"></div>
</div>
</slick>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="container">
<div ng-view=""></div>
</div>

<div ng-include="'views/partials/footer.html'"></div>

<!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
<script>
!function(A,n,g,u,l,a,r){A.GoogleAnalyticsObject=l,A[l]=A[l]||function(){
(A[l].q=A[l].q||[]).push(arguments)},A[l].l=+new Date,a=n.createElement(g),
r=n.getElementsByTagName(g)[0],a.src=u,r.parentNode.insertBefore(a,r)
}(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-XXXXX-X');
ga('send', 'pageview');
</script>

<script src="//code.jquery.com/jquery-2.2.1.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular-resource.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular-route.min.js"></script>
<script type="text/javascript" src="//cdn.jsdelivr.net/jquery.slick/1.5.9/slick.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-slick-carousel/3.1.4/angular-slick.min.js"></script>
<script src="scripts/directives/dirPagination.js"></script>


<script src="scripts/app.js"></script>
<script src="scripts/controllers/main.js"></script>
<script src="scripts/services/projectsvc.js"></script>
</body>
</html>
17 changes: 17 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "cisco-github-simple",
"version": "1.0.0",
"description": "",
"main": "gulpfile.js",
"dependencies": {
},
"devDependencies": {
"gulp": "^3.9.1",
"gulp-server-livereload": "^1.7.3"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC"
}
28 changes: 28 additions & 0 deletions scripts/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
'use strict';

/**
* @ngdoc overview
* @name ciscogithubioApp
* @description
* # ciscogithubioApp
*
* Main module of the application.
*/
angular
.module('ciscogithubioApp', [
'ngResource',
'ngRoute',
'angularUtils.directives.dirPagination',
'slickCarousel'
])
.config(function ($routeProvider) {
$routeProvider
.when('/', {
templateUrl: 'views/main.html',
controller: 'MainCtrl',
controllerAs: 'main'
})
.otherwise({
redirectTo: '/'
});
});
Loading

0 comments on commit c40a1e1

Please sign in to comment.