Skip to content

Commit

Permalink
Remove data- prefix from attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
rhutchison committed Aug 25, 2015
1 parent 01bd98b commit 3bf07fe
Show file tree
Hide file tree
Showing 25 changed files with 132 additions and 133 deletions.
6 changes: 3 additions & 3 deletions modules/articles/client/views/create-article.client.view.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section data-ng-controller="ArticlesController">
<section ng-controller="ArticlesController">
<div class="page-header">
<h1>New Article</h1>
</div>
Expand All @@ -19,8 +19,8 @@ <h1>New Article</h1>
<div class="form-group">
<input type="submit" class="btn btn-default">
</div>
<div data-ng-show="error" class="text-danger">
<strong data-ng-bind="error"></strong>
<div ng-show="error" class="text-danger">
<strong ng-bind="error"></strong>
</div>
</fieldset>
</form>
Expand Down
6 changes: 3 additions & 3 deletions modules/articles/client/views/edit-article.client.view.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section data-ng-controller="ArticlesController" data-ng-init="findOne()">
<section ng-controller="ArticlesController" ng-init="findOne()">
<div class="page-header">
<h1>Edit Article</h1>
</div>
Expand All @@ -19,8 +19,8 @@ <h1>Edit Article</h1>
<div class="form-group">
<input type="submit" value="Update" class="btn btn-default">
</div>
<div data-ng-show="error" class="text-danger">
<strong data-ng-bind="error"></strong>
<div ng-show="error" class="text-danger">
<strong ng-bind="error"></strong>
</div>
</fieldset>
</form>
Expand Down
16 changes: 8 additions & 8 deletions modules/articles/client/views/list-articles.client.view.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<section data-ng-controller="ArticlesController" data-ng-init="find()">
<section ng-controller="ArticlesController" ng-init="find()">
<div class="page-header">
<h1>Articles</h1>
</div>
<div class="list-group">
<a data-ng-repeat="article in articles" data-ui-sref="articles.view({articleId: article._id})" class="list-group-item">
<a ng-repeat="article in articles" ui-sref="articles.view({articleId: article._id})" class="list-group-item">
<small class="list-group-item-text">
Posted on
<span data-ng-bind="article.created | date:'mediumDate'"></span>
<span ng-bind="article.created | date:'mediumDate'"></span>
by
<span data-ng-bind="article.user.displayName"></span>
<span ng-bind="article.user.displayName"></span>
</small>
<h4 class="list-group-item-heading" data-ng-bind="article.title"></h4>
<p class="list-group-item-text" data-ng-bind="article.content"></p>
<h4 class="list-group-item-heading" ng-bind="article.title"></h4>
<p class="list-group-item-text" ng-bind="article.content"></p>
</a>
</div>
<div class="alert alert-warning text-center" data-ng-if="articles.$resolved && !articles.length">
No articles yet, why don't you <a data-ui-sref="articles.create">create one</a>?
<div class="alert alert-warning text-center" ng-if="articles.$resolved && !articles.length">
No articles yet, why don't you <a ui-sref="articles.create">create one</a>?
</div>
</section>
16 changes: 8 additions & 8 deletions modules/articles/client/views/view-article.client.view.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<section data-ng-controller="ArticlesController" data-ng-init="findOne()">
<section ng-controller="ArticlesController" ng-init="findOne()">
<div class="page-header">
<h1 data-ng-bind="article.title"></h1>
<h1 ng-bind="article.title"></h1>
</div>
<div class="pull-right" data-ng-show="authentication.user._id == article.user._id">
<a class="btn btn-primary" data-ui-sref="articles.edit({articleId: article._id})">
<div class="pull-right" ng-show="authentication.user._id == article.user._id">
<a class="btn btn-primary" ui-sref="articles.edit({articleId: article._id})">
<i class="glyphicon glyphicon-edit"></i>
</a>
<a class="btn btn-primary" data-ng-click="remove();">
<a class="btn btn-primary" ng-click="remove();">
<i class="glyphicon glyphicon-trash"></i>
</a>
</div>
<small>
<em class="text-muted">
Posted on
<span data-ng-bind="article.created | date:'mediumDate'"></span>
<span ng-bind="article.created | date:'mediumDate'"></span>
by
<span data-ng-bind="article.user.displayName"></span>
<span ng-bind="article.user.displayName"></span>
</em>
</small>
<p class="lead" data-ng-bind="article.content"></p>
<p class="lead" ng-bind="article.content"></p>
</section>
14 changes: 7 additions & 7 deletions modules/chat/client/views/chat.client.view.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!-- The chat view -->
<section class="container" data-ng-controller="ChatController">
<section class="container" ng-controller="ChatController">
<div class="page-header">
<h1>Chat Example</h1>
</div>
<!-- The message form -->
<form class="col-xs-12 col-md-offset-4 col-md-4" ng-submit="sendMessage();">
<fieldset class="row">
<div class="input-group">
<input type="text" id="messageText" name="messageText" class="form-control" data-ng-model="messageText" placeholder="Enter new message">
<input type="text" id="messageText" name="messageText" class="form-control" ng-model="messageText" placeholder="Enter new message">
<span class="input-group-btn">
<button type="submit" class="btn btn-primary">Submit</button>
</span>
Expand All @@ -16,13 +16,13 @@ <h1>Chat Example</h1>
</form>
<ul class="list-unstyled">
<!-- List all messages -->
<li class="col-xs-12 col-md-offset-4 col-md-4 chat-message" data-ng-repeat="message in messages">
<small class="pull-right text-muted" data-ng-bind="message.created | date:'mediumTime'"></small>
<img data-ng-src="{{message.profileImageURL}}" alt="{{message.username}}" class="pull-left chat-profile-image" />
<li class="col-xs-12 col-md-offset-4 col-md-4 chat-message" ng-repeat="message in messages">
<small class="pull-right text-muted" ng-bind="message.created | date:'mediumTime'"></small>
<img ng-src="{{message.profileImageURL}}" alt="{{message.username}}" class="pull-left chat-profile-image" />
<div class="pull-left chat-message-details">
<strong data-ng-bind="message.username"></strong>
<strong ng-bind="message.username"></strong>
<br>
<span data-ng-bind="message.text"></span>
<span ng-bind="message.text"></span>
</div>
</li>
</ul>
Expand Down
1 change: 0 additions & 1 deletion modules/core/client/css/core.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
}
[ng\:cloak],
[ng-cloak],
[data-ng-cloak],
[x-ng-cloak],
.ng-cloak,
.x-ng-cloak {
Expand Down
48 changes: 24 additions & 24 deletions modules/core/client/views/header.client.view.html
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
<div class="container" data-ng-controller="HeaderController">
<div class="container" ng-controller="HeaderController">
<div class="navbar-header">
<button class="navbar-toggle" type="button" data-ng-click="toggleCollapsibleMenu()">
<button class="navbar-toggle" type="button" ng-click="toggleCollapsibleMenu()">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a data-ui-sref="home" class="navbar-brand">MEAN.JS</a>
<a ui-sref="home" class="navbar-brand">MEAN.JS</a>
</div>
<nav class="collapse navbar-collapse" collapse="!isCollapsed" role="navigation">
<ul class="nav navbar-nav" data-ng-if="menu.shouldRender(authentication.user);">
<li data-ng-repeat="item in menu.items | orderBy: 'position'" data-ng-if="item.shouldRender(authentication.user);" ng-switch="item.type" data-ng-class="{ active: $state.includes(item.state), dropdown: item.type === 'dropdown' }" class="{{item.class}}" dropdown="item.type === 'dropdown'">
<ul class="nav navbar-nav" ng-if="menu.shouldRender(authentication.user);">
<li ng-repeat="item in menu.items | orderBy: 'position'" ng-if="item.shouldRender(authentication.user);" ng-switch="item.type" ng-class="{ active: $state.includes(item.state), dropdown: item.type === 'dropdown' }" class="{{item.class}}" dropdown="item.type === 'dropdown'">
<a ng-switch-when="dropdown" class="dropdown-toggle" dropdown-toggle role="button">{{::item.title}}&nbsp;<span class="caret"></span></a>
<ul ng-switch-when="dropdown" class="dropdown-menu">
<li data-ng-repeat="subitem in item.items | orderBy: 'position'" data-ng-if="subitem.shouldRender(authentication.user);" data-ui-sref-active="active">
<a data-ui-sref="{{subitem.state}}" data-ng-bind="subitem.title"></a>
<li ng-repeat="subitem in item.items | orderBy: 'position'" ng-if="subitem.shouldRender(authentication.user);" ui-sref-active="active">
<a ui-sref="{{subitem.state}}" ng-bind="subitem.title"></a>
</li>
</ul>
<a ng-switch-default data-ui-sref="{{item.state}}" data-ng-bind="item.title"></a>
<a ng-switch-default ui-sref="{{item.state}}" ng-bind="item.title"></a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right" data-ng-hide="authentication.user">
<li data-ui-sref-active="active">
<a data-ui-sref="authentication.signup">Sign Up</a>
<ul class="nav navbar-nav navbar-right" ng-hide="authentication.user">
<li ui-sref-active="active">
<a ui-sref="authentication.signup">Sign Up</a>
</li>
<li class="divider-vertical"></li>
<li data-ui-sref-active="active">
<a data-ui-sref="authentication.signin">Sign In</a>
<li ui-sref-active="active">
<a ui-sref="authentication.signin">Sign In</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right" data-ng-show="authentication.user">
<ul class="nav navbar-nav navbar-right" ng-show="authentication.user">
<li class="dropdown" dropdown>
<a class="dropdown-toggle user-header-dropdown-toggle" dropdown-toggle role="button">
<img data-ng-src="{{authentication.user.profileImageURL}}" alt="{{authentication.user.displayName}}" class="header-profile-image" />
<span data-ng-bind="authentication.user.displayName"></span> <b class="caret"></b>
<img ng-src="{{authentication.user.profileImageURL}}" alt="{{authentication.user.displayName}}" class="header-profile-image" />
<span ng-bind="authentication.user.displayName"></span> <b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu">
<li data-ui-sref-active="active">
<a data-ui-sref="settings.profile">Edit Profile</a>
<li ui-sref-active="active">
<a ui-sref="settings.profile">Edit Profile</a>
</li>
<li data-ui-sref-active="active">
<a data-ui-sref="settings.picture">Change Profile Picture</a>
<li ui-sref-active="active">
<a ui-sref="settings.picture">Change Profile Picture</a>
</li>
<li data-ui-sref-active="active" data-ng-show="authentication.user.provider === 'local'">
<a data-ui-sref="settings.password">Change Password</a>
<li ui-sref-active="active" ng-show="authentication.user.provider === 'local'">
<a ui-sref="settings.password">Change Password</a>
</li>
<li data-ui-sref-active="active">
<a data-ui-sref="settings.accounts">Manage Social Accounts</a>
<li ui-sref-active="active">
<a ui-sref="settings.accounts">Manage Social Accounts</a>
</li>
<li class="divider"></li>
<li>
Expand Down
2 changes: 1 addition & 1 deletion modules/core/client/views/home.client.view.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section data-ng-controller="HomeController">
<section ng-controller="HomeController">
<div class="jumbotron text-center">
<div class="row">
<div class="col-md-6 col-md-offset-3 col-sm-6 col-sm-offset-3 col-xs-12">
Expand Down
2 changes: 1 addition & 1 deletion modules/core/server/views/index.server.view.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'layout.server.view.html' %}

{% block content %}
<section data-ui-view></section>
<section ui-view></section>
{% endblock %}
2 changes: 1 addition & 1 deletion modules/core/server/views/layout.server.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</head>

<body class="ng-cloak">
<header data-ng-include="'/modules/core/client/views/header.client.view.html'" class="navbar navbar-fixed-top navbar-inverse"></header>
<header ng-include="'/modules/core/client/views/header.client.view.html'" class="navbar navbar-fixed-top navbar-inverse"></header>
<section class="content">
<section class="container">
{% block content %}{% endblock %}
Expand Down
4 changes: 2 additions & 2 deletions modules/users/client/views/admin/user-edit.client.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ <h1>User <span ng-bind="user.username"></span></h1>
<div class="form-group">
<input type="submit" value="Update" class="btn btn-default">
</div>
<div data-ng-show="error" class="text-danger">
<strong data-ng-bind="error"></strong>
<div ng-show="error" class="text-danger">
<strong ng-bind="error"></strong>
</div>
</fieldset>
</form>
Expand Down
8 changes: 4 additions & 4 deletions modules/users/client/views/admin/user-list.client.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<h1>Users</h1>
</div>
<div class="col-md-4" style="margin-top: 2em">
<input class="form-control col-md-4" type="text" data-ng-model="search" placeholder="Search" ng-change="figureOutItemsToDisplay()" />
<input class="form-control col-md-4" type="text" ng-model="search" placeholder="Search" ng-change="figureOutItemsToDisplay()" />
</div>
</div>
</div>
<div class="list-group">
<a data-ng-repeat="user in pagedItems" data-ui-sref="admin.user({userId: user._id})" class="list-group-item">
<h4 class="list-group-item-heading" data-ng-bind="user.username"></h4>
<p class="list-group-item-text" data-ng-bind="user.email"></p>
<a ng-repeat="user in pagedItems" ui-sref="admin.user({userId: user._id})" class="list-group-item">
<h4 class="list-group-item-heading" ng-bind="user.username"></h4>
<p class="list-group-item-text" ng-bind="user.email"></p>
</a>
</div>

Expand Down
18 changes: 9 additions & 9 deletions modules/users/client/views/admin/user.client.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<div class="page-header">
<div class="row">
<div class="col-md-6">
<h1 data-ng-bind="user.username"></h1>
<h1 ng-bind="user.username"></h1>
</div>
<div class="col-md-4">
<a class="btn btn-primary" data-ui-sref="admin.user-edit({userId: user._id})">
<a class="btn btn-primary" ui-sref="admin.user-edit({userId: user._id})">
<i class="glyphicon glyphicon-edit"></i>
</a>
<a class="btn btn-primary" data-ng-click="remove();" ng-if="user._id !== authentication.user._id">
<a class="btn btn-primary" ng-click="remove();" ng-if="user._id !== authentication.user._id">
<i class="glyphicon glyphicon-trash"></i>
</a>
</div>
Expand All @@ -19,32 +19,32 @@ <h1 data-ng-bind="user.username"></h1>
<div class="col-md-8">
<div class="row">
<div class="col-md-3"><strong>First Name</strong></div>
<div class="col-md-6" data-ng-bind="user.firstName"></div>
<div class="col-md-6" ng-bind="user.firstName"></div>
</div>
<hr/>
<div class="row">
<div class="col-md-3"><strong>Last Name</strong></div>
<div class="col-md-6" data-ng-bind="user.lastName"></div>
<div class="col-md-6" ng-bind="user.lastName"></div>
</div>
<hr/>
<div class="row">
<div class="col-md-3"><strong>Email</strong></div>
<div class="col-md-6" data-ng-bind="user.email"></div>
<div class="col-md-6" ng-bind="user.email"></div>
</div>
<hr/>
<div class="row">
<div class="col-md-3"><strong>Provider</strong></div>
<div class="col-md-6" data-ng-bind="user.provider"></div>
<div class="col-md-6" ng-bind="user.provider"></div>
</div>
<hr/>
<div class="row">
<div class="col-md-3"><strong>Created</strong></div>
<div class="col-md-6" data-ng-bind="user.created"></div>
<div class="col-md-6" ng-bind="user.created"></div>
</div>
<hr/>
<div class="row">
<div class="col-md-3"><strong>Roles</strong></div>
<div class="col-md-6" data-ng-bind="user.roles"></div>
<div class="col-md-6" ng-bind="user.roles"></div>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section class="row" data-ng-controller="AuthenticationController">
<section class="row" ng-controller="AuthenticationController">
<h3 class="col-md-12 text-center">Sign in using your social accounts</h3>
<div class="col-md-12 text-center">
<img ng-click="callOauthProvider('/api/auth/facebook')" ng-src="/modules/users/client/img/buttons/facebook.png">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div data-ng-controller="AuthenticationController">
<div ng-controller="AuthenticationController">
<h3 class="col-md-12 text-center">Or with your account</h3>
<div class="col-xs-offset-2 col-xs-8 col-md-offset-4 col-md-4">
<form name="userForm" ng-submit="signin(userForm.$valid)" class="signin" novalidate autocomplete="off">
Expand All @@ -20,13 +20,13 @@ <h3 class="col-md-12 text-center">Or with your account</h3>
<div class="text-center form-group">
<button type="submit" class="btn btn-primary">Sign in</button>
&nbsp; or&nbsp;
<a data-ui-sref="authentication.signup">Sign up</a>
<a ui-sref="authentication.signup">Sign up</a>
</div>
<div class="text-center forgot-password">
<a data-ui-sref="password.forgot">Forgot your password?</a>
<a ui-sref="password.forgot">Forgot your password?</a>
</div>
<alert type="danger" data-ng-show="error" class="text-center text-danger">
<span data-ng-bind="error"></span>
<alert type="danger" ng-show="error" class="text-center text-danger">
<span ng-bind="error"></span>
</alert>
</fieldset>
</form>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div data-ng-controller="AuthenticationController">
<div ng-controller="AuthenticationController">
<h3 class="col-md-12 text-center">Or sign up using your email</h3>
<div class="col-xs-offset-2 col-xs-8 col-md-offset-4 col-md-4">
<form name="userForm" ng-submit="signup(userForm.$valid)" class="signin" novalidate autocomplete="off">
Expand Down Expand Up @@ -43,10 +43,10 @@ <h3 class="col-md-12 text-center">Or sign up using your email</h3>
<div class="text-center form-group">
<button type="submit" class="btn btn-large btn-primary">Sign up</button>
&nbsp; or&nbsp;
<a data-ui-sref="authentication.signin" class="show-signup">Sign in</a>
<a ui-sref="authentication.signin" class="show-signup">Sign in</a>
</div>
<div data-ng-show="error" class="text-center text-danger">
<strong data-ng-bind="error"></strong>
<div ng-show="error" class="text-center text-danger">
<strong ng-bind="error"></strong>
</div>
</fieldset>
</form>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<section class="row" data-ng-controller="PasswordController">
<section class="row" ng-controller="PasswordController">
<h3 class="col-md-12 text-center">Restore your password</h3>
<p class="small text-center">Enter your account username.</p>
<div class="col-xs-offset-2 col-xs-8 col-md-offset-5 col-md-2">
<form data-ng-submit="askForPasswordReset()" class="form-horizontal" autocomplete="off">
<form ng-submit="askForPasswordReset()" class="form-horizontal" autocomplete="off">
<fieldset>
<div class="form-group">
<input type="text" id="username" name="username" class="form-control" data-ng-model="credentials.username" placeholder="Username">
<input type="text" id="username" name="username" class="form-control" ng-model="credentials.username" placeholder="Username">
</div>
<div class="text-center form-group">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
<div data-ng-show="error" class="text-center text-danger">
<div ng-show="error" class="text-center text-danger">
<strong>{{error}}</strong>
</div>
<div data-ng-show="success" class="text-center text-success">
<div ng-show="success" class="text-center text-success">
<strong>{{success}}</strong>
</div>
</fieldset>
Expand Down
Loading

0 comments on commit 3bf07fe

Please sign in to comment.