Merge branch 'master' of github.com:pebble/cloudpebble

Author: Katharine

ide/models/files.py

@@ -79,7 +79,19 @@ def get_path(self, variant):
 
     @property
     def root_path(self):
-        return self.get_best_variant(ResourceVariant.VARIANT_DEFAULT).get_path()
+        # Either return the path of the default variant if it exists
+        # or strip out the suffix from another variant
+        for variant, suffix in ResourceVariant.RESOURCE_VARIANTS:
+            try:
+                file_name = self.get_best_variant(variant).get_path()
+                if variant == ResourceVariant.VARIANT_DEFAULT:
+                    return file_name
+                else:
+                    file_name_parts = os.path.splitext(file_name)
+                    return file_name_parts[0][:len(file_name_parts[0]) - len(suffix) - 1] + file_name_parts[1]
+            except ResourceVariant.DoesNotExist:
+                continue
+        raise Exception("No root path found for resource %s" % self.file_name)
 
     class Meta(IdeModel.Meta):
         unique_together = (('project', 'file_name'),)
@@ -163,7 +175,6 @@ def save(self, *args, **kwargs):
         self.resource_file.save()
         super(ResourceVariant, self).save(*args, **kwargs)
 
-
     VARIANT_SUFFIXES = {
         0: '',
         1: '~bw',
@@ -278,4 +289,4 @@ def delete_file(sender, instance, **kwargs):
             try:
                 os.unlink(instance.local_filename)
             except OSError:
-                pass
+                pass

ide/static/ide/css/ide.css

@@ -974,3 +974,32 @@ span.cm-autofilled-end {
   color: #d0d0d0;
 }
 
+#fuzzy-prompt .modal-footer {
+    padding: 0 0 10px 0;
+    text-align: left;
+}
+
+#fuzzy-results > div {
+
+    line-height: 28px;
+    cursor: pointer;
+    cursor: hand;
+    padding-left: 25px;
+}
+
+#fuzzy-results > div.selected {
+    color: white;
+    background-color: #333;
+}
+
+#fuzzy-prompt-input-value {
+    width: 100%;
+}
+
+#fuzzy-prompt-input-value:focus{
+    outline: 0;
+}
+
+.padded-modal-header {
+    padding: 10px 25px 10px 10px;
+}