summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2011-06-14 00:02:54 -0500
committerAdam Young <ayoung@redhat.com>2011-06-16 11:12:42 -0400
commit724dd997447c84c6eb3893fe40fb2c5a78d4efd7 (patch)
tree3c42abb6506a1516afda37165346d3f047adfeaf
parent82fbfbd773fb6b97ad30852c4692148fb9575b39 (diff)
downloadfreeipa-724dd997447c84c6eb3893fe40fb2c5a78d4efd7.tar.gz
freeipa-724dd997447c84c6eb3893fe40fb2c5a78d4efd7.tar.xz
freeipa-724dd997447c84c6eb3893fe40fb2c5a78d4efd7.zip
Renamed associate.js to association.js.
-rw-r--r--install/ui/Makefile.am2
-rw-r--r--install/ui/association.js (renamed from install/ui/associate.js)0
-rw-r--r--install/ui/index.html2
-rw-r--r--install/ui/jsl.conf2
-rwxr-xr-xinstall/ui/test/aci_tests.html2
-rw-r--r--install/ui/test/all_tests.html2
-rw-r--r--install/ui/test/association_tests.html2
-rw-r--r--install/ui/test/association_tests.js2
-rw-r--r--install/ui/test/entity_tests.html2
9 files changed, 8 insertions, 8 deletions
diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am
index 3db1427b2..dedc43dbe 100644
--- a/install/ui/Makefile.am
+++ b/install/ui/Makefile.am
@@ -10,7 +10,7 @@ appdir = $(IPA_DATA_DIR)/ui
app_DATA = \
aci.js \
add.js \
- associate.js \
+ association.js \
automount.js \
background-center.png \
background-left.png \
diff --git a/install/ui/associate.js b/install/ui/association.js
index 2115e0fe1..2115e0fe1 100644
--- a/install/ui/associate.js
+++ b/install/ui/association.js
diff --git a/install/ui/index.html b/install/ui/index.html
index 6e85d28b3..8fa96bf72 100644
--- a/install/ui/index.html
+++ b/install/ui/index.html
@@ -16,7 +16,7 @@
<script type="text/javascript" src="search.js"></script>
<script type="text/javascript" src="details.js"></script>
<script type="text/javascript" src="add.js"></script>
- <script type="text/javascript" src="associate.js"></script>
+ <script type="text/javascript" src="association.js"></script>
<script type="text/javascript" src="entity.js"></script>
<script type="text/javascript" src="navigation.js"></script>
<script type="text/javascript" src="rule.js"></script>
diff --git a/install/ui/jsl.conf b/install/ui/jsl.conf
index e7d09ec0c..06fdb6004 100644
--- a/install/ui/jsl.conf
+++ b/install/ui/jsl.conf
@@ -132,7 +132,7 @@
+process search.js
+process details.js
+process add.js
-+process associate.js
++process association.js
+process entity.js
+process navigation.js
+process rule.js
diff --git a/install/ui/test/aci_tests.html b/install/ui/test/aci_tests.html
index be035c413..4b024ec10 100755
--- a/install/ui/test/aci_tests.html
+++ b/install/ui/test/aci_tests.html
@@ -18,7 +18,7 @@
<script type="text/javascript" src="../search.js"></script>
<script type="text/javascript" src="../add.js"></script>
<script type="text/javascript" src="../entity.js"></script>
- <script type="text/javascript" src="../associate.js"></script>
+ <script type="text/javascript" src="../association.js"></script>
<script type="text/javascript" src="../navigation.js"></script>
<script type="text/javascript" src="../aci.js"></script>
diff --git a/install/ui/test/all_tests.html b/install/ui/test/all_tests.html
index be0bf3ea1..7af7e02b3 100644
--- a/install/ui/test/all_tests.html
+++ b/install/ui/test/all_tests.html
@@ -15,7 +15,7 @@
<script type="text/javascript" src="../search.js"></script>
<script type="text/javascript" src="../add.js"></script>
<script type="text/javascript" src="../entity.js"></script>
- <script type="text/javascript" src="../associate.js"></script>
+ <script type="text/javascript" src="../association.js"></script>
<script type="text/javascript" src="../navigation.js"></script>
<script type="text/javascript" src="../certificate.js"></script>
<script type="text/javascript" src="../aci.js"></script>
diff --git a/install/ui/test/association_tests.html b/install/ui/test/association_tests.html
index e9e3650ba..a25e417af 100644
--- a/install/ui/test/association_tests.html
+++ b/install/ui/test/association_tests.html
@@ -12,7 +12,7 @@
<script type="text/javascript" src="../details.js"></script>
<script type="text/javascript" src="../search.js"></script>
<script type="text/javascript" src="../add.js"></script>
- <script type="text/javascript" src="../associate.js"></script>
+ <script type="text/javascript" src="../association.js"></script>
<script type="text/javascript" src="association_tests.js"></script>
</head>
<body>
diff --git a/install/ui/test/association_tests.js b/install/ui/test/association_tests.js
index bad8d1a84..7eea1fc91 100644
--- a/install/ui/test/association_tests.js
+++ b/install/ui/test/association_tests.js
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-module('associate');
+module('association');
test("Testing serial_associator().", function() {
diff --git a/install/ui/test/entity_tests.html b/install/ui/test/entity_tests.html
index 8b41f8fe9..bd48db205 100644
--- a/install/ui/test/entity_tests.html
+++ b/install/ui/test/entity_tests.html
@@ -13,7 +13,7 @@
<script type="text/javascript" src="../details.js"></script>
<script type="text/javascript" src="../search.js"></script>
<script type="text/javascript" src="../add.js"></script>
- <script type="text/javascript" src="../associate.js"></script>
+ <script type="text/javascript" src="../association.js"></script>
<script type="text/javascript" src="../navigation.js"></script>
<script type="text/javascript" src="../entity.js"></script>
<script type="text/javascript" src="entity_tests.js"></script>