Changeset 2228

Timestamp:

12/28/2015 12:38:09 PM (9 years ago)

Author:

ocean90

Message:

Rosetta Roles: Display slugs of projects because project names are not unique.

Also decode entities in project names because the data is exported to JavaScript.

Fixes #1499.

Location:

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles

Files:

• css/rosetta-roles-rtl.css (modified) (3 diffs)
• css/rosetta-roles.css (modified) (3 diffs)
• js/rosetta-roles.js (modified) (1 diff)
• rosetta-roles.php (modified) (3 diffs)

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/css/rosetta-roles-rtl.css

@@ -23 +23 @@
 }
 
-#projects-list label {
+#projects-list > li label {
     margin: 0 !important;
 }
@@ -56 +56 @@
 }
 
+#projects-list .sub-projects-wrapper label {
+    display: block;
+    margin-right: 24px !important;
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
+
+.sub-projects-wrapper label > input {
+    margin-left: 4px;
+    margin-right: -24px;
+}
+
 .sub-projects-search {
     width: 100%;
@@ -63 +75 @@
 .sub-projects-list {
     margin: 0 2px 0 0;
+}
+
+.project-checkbox .project-slug {
+    display: none;
+    color: #666;
+    font-size: 13px;
+}
+
+.sub-projects-wrapper .project-checkbox .project-slug {
+    display: inline;
 }
 

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/css/rosetta-roles.css

@@ -23 +23 @@
 }
 
-#projects-list label {
+#projects-list > li label {
     margin: 0 !important;
 }
@@ -56 +56 @@
 }
 
+#projects-list .sub-projects-wrapper label {
+    display: block;
+    margin-left: 24px !important;
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
+
+.sub-projects-wrapper label > input {
+    margin-right: 4px;
+    margin-left: -24px;
+}
+
 .sub-projects-search {
     width: 100%;
@@ -63 +75 @@
 .sub-projects-list {
     margin: 0 0 0 2px;
+}
+
+.project-checkbox .project-slug {
+    display: none;
+    color: #666;
+    font-size: 13px;
+}
+
+.sub-projects-wrapper .project-checkbox .project-slug {
+    display: inline;
 }
 

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/js/rosetta-roles.js

@@ -192 +192 @@
 
         prepare: function() {
-            return _.pick( this.model.toJSON(), 'id', 'name', 'checked', 'checkedSubProjects' );
+            return _.pick( this.model.toJSON(), 'id', 'name', 'slug', 'checked', 'checkedSubProjects' );
         },
 

sites/trunk/global.wordpress.org/public_html/wp-content/mu-plugins/roles/rosetta-roles.php

@@ -194 +194 @@
     public function enqueue_styles() {
         $suffix = is_rtl() ? '-rtl' : '';
-        wp_enqueue_style( 'rosetta-roles', plugins_url( "/css/rosetta-roles$suffix.css", __FILE__ ), array(), '2' );
+        wp_enqueue_style( 'rosetta-roles', plugins_url( "/css/rosetta-roles$suffix.css", __FILE__ ), array(), '3' );
     }
 
@@ -214 +214 @@
                     />
                     {{data.name}}
+                    <span class="project-slug">({{data.slug}})</span>
                 </label>
             <# } else { #>
                 <label>
                     <input type="radio" class="input-radio" checked="checked" /> {{data.name}}
+                    <span class="project-slug">({{data.slug}})</span>
                 </label>
             <# } #>
@@ -772 +774 @@
         $projects = array();
         foreach ( $_projects as $project ) {
+            $project->name = html_entity_decode( $project->name, ENT_QUOTES, 'UTF-8' );
             $projects[ $project->id ] = $project;
         }