Skip to content

Commit

Permalink
Merge branch 'master' into es_script_updates
Browse files Browse the repository at this point in the history
npapacostas committed Feb 12, 2016
2 parents a415e09 + 468e595 commit 341ba3e
Showing 7 changed files with 43 additions and 9 deletions.
22 changes: 22 additions & 0 deletions auth/conf/logger.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<configuration>

<contextName>auth</contextName>

<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%date [%thread] %-5level GUUID=%X{GUUID} %logger{36}:%L - %msg%n%xException{15}</pattern>
</encoder>
</appender>

<logger name="play" level="INFO" />
<logger name="application" level="DEBUG" />

<root level="DEBUG">
<appender-ref ref="CONSOLE"/>
</root>

<logger name="com.amazonaws">
<level value="ERROR" />
</logger>

</configuration>
1 change: 1 addition & 0 deletions kahuna/app/controllers/Application.scala
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ object Application extends Controller {
val returnUri = Config.rootUri + okPath
Ok(views.html.main(
Config.mediaApiUri,
Config.authUri,
s"${Config.authUri}/login?redirectUri=$returnUri",
Config.watUri,
Config.sentryDsn))
5 changes: 5 additions & 0 deletions kahuna/app/views/main.scala.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@(mediaApiUri: String,
authApiUri: String,
reauthUri: String,
watUri: Option[String],
sentryDsn: Option[String])
@@ -10,6 +11,10 @@

<title ui:title ui:title-suffix="the grid">the grid</title>

<!-- preconnect to core APIs ahead of JS making the requests -->
<link rel="preconnect" href="@mediaApiUri"/>
<link rel="preconnect" href="@authApiUri"/>

<link rel="shortcut icon" type="image/png" href="@routes.Assets.at("images/grid-favicon-32.png")"/>
<link rel="assets" href="@routes.Assets.at("")"/>
<link rel="media-api-uri" href="@mediaApiUri" />
Original file line number Diff line number Diff line change
@@ -11,10 +11,13 @@
<!-- We use $parent.editing here as ng:if creates it's own child scope -->
<div class="flex-container collections-panel-heading text-small" ng:if="! ctrl.error">
<div class="flex-spacer">Collections</div>
<button ng:click="$parent.editing = !$parent.editing">
<gr-icon>edit</gr-icon>
<span ng:hide="$parent.editing">Edit</span>
<span ng:show="$parent.editing">Finished editing</span>

<button ng:class="{'button-edit': ! $parent.editing, 'button-save': $parent.editing}"
ng:click="$parent.editing = !$parent.editing">
<gr-icon-label ng:if="! $parent.editing"
gr:icon="edit">Edit</gr-icon-label>
<gr-icon-label ng:if="$parent.editing"
gr:icon="check">Finished</gr-icon-label>
</button>
</div>
<gr-nodes gr:nodes="ctrl.collections"
2 changes: 1 addition & 1 deletion kahuna/public/js/util/eq.js
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ export var eq = angular.module('util.eq', []);

eq.value('onValChange', function(fn) {
return function(newVal, oldVal, objectEquality) {
if (newVal !== oldVal) {
if (!angular.equals(newVal, oldVal)) {
fn(newVal, oldVal, objectEquality);
}
};
9 changes: 6 additions & 3 deletions kahuna/public/stylesheets/main.css
Original file line number Diff line number Diff line change
@@ -209,16 +209,19 @@ button[disabled],
background-color: #008fc5;
}

.button-cancel {
.button-cancel,
.button-edit {
background-color: #898989;
}

.button-cancel:hover {
.button-cancel:hover,
.button-edit:hover {
background-color: #666666;
}

.button-save,
.button-cancel {
.button-cancel,
.button-edit {
padding: 0 5px;
height: 24px;
color: white;
2 changes: 1 addition & 1 deletion media-api/app/lib/elasticsearch/ElasticSearch.scala
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ object ElasticSearch extends ElasticSearchClient with SearchFilters with ImageFi

val matchFields: Seq[String] = Seq("id") ++
Seq("description", "title", "byline", "source", "credit", "keywords",
"subLocation", "city", "state", "country", "suppliersReference").map(metadataField) ++
"subLocation", "city", "state", "country", "suppliersReference", "englishAnalysedCatchAll").map(metadataField) ++
Seq("labels").map(editsField) ++
Config.queriableIdentifiers.map(identifierField)

0 comments on commit 341ba3e

Please sign in to comment.